diff --git a/src/components/menu-sidebar.js b/src/components/menu-sidebar.js
index 1782304..882ab56 100644
--- a/src/components/menu-sidebar.js
+++ b/src/components/menu-sidebar.js
@@ -33,7 +33,9 @@ class SidebarMenu extends Component {
           <li><Link to="/projects" activeClassName="active">Projects</Link></li>
           <li><Link to="/simulations" activeClassName="active">Simulations</Link></li>
           <li><Link to="/simulators" activeClassName="active">Simulators</Link></li>
-          <li><Link to="/users" activeClassName="active">User Management</Link></li>
+          { this.props.currentRole === 'admin' ? 
+              <li><Link to="/users" activeClassName="active">User Management</Link></li> : ''
+          }
           <li><Link to="/logout">Logout</Link></li>
         </ul>
       </div>
diff --git a/src/containers/app.js b/src/containers/app.js
index 4e90442..9e6eaf0 100644
--- a/src/containers/app.js
+++ b/src/containers/app.js
@@ -76,9 +76,11 @@ class App extends Component {
       }
     }
 
+    let currentUser = UserStore.getState().currentUser;
+    
     return {
       simulations: SimulationStore.getState(),
-      currentUser: UserStore.getState().currentUser,
+      currentRole: currentUser? currentUser.role : '',
       token: UserStore.getState().token,
 
       runningSimulators: simulators
@@ -183,7 +185,7 @@ class App extends Component {
         <NotificationSystem ref="notificationSystem" />
 
         <Header />
-        <SidebarMenu />
+        <SidebarMenu currentRole={ this.state.currentRole }/>
 
         <div className="app-content">
           {children}
diff --git a/src/data-managers/users-data-manager.js b/src/data-managers/users-data-manager.js
index bd60534..f5db8f8 100644
--- a/src/data-managers/users-data-manager.js
+++ b/src/data-managers/users-data-manager.js
@@ -46,7 +46,7 @@ class UsersDataManager extends RestDataManager {
     RestAPI.get(this.makeURL('/users/me'), token).then(response => {
       AppDispatcher.dispatch({
         type: 'users/current-user',
-        user: response
+        user: response.user
       });
     }).catch(error => {
       AppDispatcher.dispatch({