diff --git a/client/src/components/LoggedInUser.js b/client/src/components/LoggedInUser.js
index 0f69114c6..5299272da 100644
--- a/client/src/components/LoggedInUser.js
+++ b/client/src/components/LoggedInUser.js
@@ -4,6 +4,13 @@ import {getUserByAuthIdQuery} from '../queries/queries'
 
 import LoggedInUserMenu from './LoggedInUserMenu'
 import Button from '@material-ui/core/Button'
+import IconButton from '@material-ui/core/IconButton'
+
+// icons
+import UserIcon from '@material-ui/icons/Person'
+import { Link } from 'react-router-dom'
+
+const UserLink = props => <Link to='/user' {...props} />
 
 class LoggedInUser extends Component {
 
@@ -35,7 +42,13 @@ class LoggedInUser extends Component {
 
       return (
         <div>
-          <p><LoggedInUserMenu menuLabel={displayName} identityProvider={identityProvider} /></p>
+          <IconButton
+
+            color='inherit'
+            title='Your Profile'
+            component={UserLink}>
+            <UserIcon />
+          </IconButton>
         </div>
       )
     } else {
diff --git a/client/src/components/NavBar.js b/client/src/components/NavBar.js
index 88b43814e..85c82c79e 100644
--- a/client/src/components/NavBar.js
+++ b/client/src/components/NavBar.js
@@ -12,14 +12,12 @@ import BrowseIcon from '@material-ui/icons/ImportContacts'
 import SearchIcon from '@material-ui/icons/Search'
 import ContactIcon from '@material-ui/icons/ContactMail'
 import AboutIcon from '@material-ui/icons/FormatShapes'
-import UserIcon from '@material-ui/icons/Person'
 
 import { Link } from 'react-router-dom'
 
 // components
 import LoggedInUser from './LoggedInUser'
 
-const UserLink = props => <Link to='/user' {...props} />
 const AboutLink = props => <Link to='/about' {...props} />
 const ContactLink = props => <Link to='/contact' {...props} />
 const SearchLink = props => <Link to='/search' {...props} />
@@ -113,13 +111,6 @@ class NavBar extends Component {
               component={AboutLink}>
               <AboutIcon />
             </IconButton>
-            <IconButton
-              className={classes.menuButton}
-              color='inherit'
-              title='Your Profile'
-              component={UserLink}>
-              <UserIcon />
-            </IconButton>
             <LoggedInUser authId={this.state.authId} />
           </Toolbar>
         </AppBar>
diff --git a/client/src/components/ProfileSheet.js b/client/src/components/ProfileSheet.js
index 3c6de0859..56a4dd74e 100644
--- a/client/src/components/ProfileSheet.js
+++ b/client/src/components/ProfileSheet.js
@@ -279,8 +279,8 @@ class ProfileSheet extends Component {
   displayIdentityProvider () {
     const { classes } = this.props
     let authId = this.state.authId
-    console.log('state', this.state)
-    if (authId !== undefined) {
+
+    if (authId !== undefined && authId !== null) {
       let authArray = this.state.authId.split('|')
       let identityProvider = authArray[0]