diff --git a/app/components/AdminPage.js b/app/components/AdminPage.js
index b0f1f8e3bc992dcba479c0428d9b26dd2a600032..8a73fa9cc4141e5cb27153da4c9e34ec1e304e92 100644
--- a/app/components/AdminPage.js
+++ b/app/components/AdminPage.js
@@ -110,6 +110,7 @@ const AdminPage = ({ children, history, match }) => {
   let links = []
   const formBuilderLink = `/journal/admin/form-builder`
   const homeLink = '/journal/dashboard'
+  const profileLink = '/journal/profile'
 
   if (showLinks) {
     const params = getParams(pathname)
@@ -140,6 +141,10 @@ const AdminPage = ({ children, history, match }) => {
     })
   }
 
+  if (currentUser) {
+    links.push({ link: profileLink, name: 'My profile', icon: 'user' })
+  }
+
   return (
     <Root converting={conversion.converting}>
       <Menu
diff --git a/app/components/Menu.js b/app/components/Menu.js
index f995464a9bd90b4383d914af87f8718f326ae3a9..45963e4444671966ea218f2ae0183195731e8662 100644
--- a/app/components/Menu.js
+++ b/app/components/Menu.js
@@ -105,6 +105,9 @@ const UserItem = styled(Link)`
 
 const UserInfo = styled.div`
   margin-left: ${grid(1)};
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
 `
 
 const Menu = ({
@@ -134,10 +137,11 @@ const Menu = ({
 const UserComponent = ({ user, loginLink }) => (
   <Section>
     {user && (
-      <UserItem to="/journal/profile">
-        <UserAvatar size={64} user={user} />
+      <UserItem title="Go to your profile" to="/journal/profile">
+        <UserAvatar isClickable={false} size={48} user={user} />
         <UserInfo>
-          {user.defaultIdentity.name || user.username}
+          <p>{user.defaultIdentity.name || user.username}</p>
+          <p>{user.online ? '' : 'Offline'}</p>
           {/* ({user.username}) */}
           {user.admin ? ' (admin)' : ''}
         </UserInfo>
diff --git a/app/components/component-avatar/src/index.js b/app/components/component-avatar/src/index.js
index 959dab127935b2cecdeef7967d5fad88d4b4e9ac..f7f49c4044f8ea16b22c0306d9392a0658140267 100644
--- a/app/components/component-avatar/src/index.js
+++ b/app/components/component-avatar/src/index.js
@@ -1,5 +1,3 @@
-// import CommunityAvatar from './communityAvatar';
 import UserAvatar from './UserAvatar'
 
-// export { CommunityAvatar, UserAvatar };
 export { UserAvatar }