diff --git a/modules/core/client/config/core.client.menus.js b/modules/core/client/config/core.client.menus.js
new file mode 100644
index 00000000..1e52689b
--- /dev/null
+++ b/modules/core/client/config/core.client.menus.js
@@ -0,0 +1,45 @@
+(function () {
+  'use strict';
+
+  angular
+  .module('core')
+  .run(MenuConfig);
+
+  MenuConfig.$inject = ['Menus'];
+
+  function MenuConfig(Menus) {
+
+    Menus.addMenu('account', {
+      roles: ['user']
+    });
+
+    Menus.addMenuItem('account', {
+      title: '',
+      state: 'settings',
+      type: 'dropdown',
+      roles: ['user']
+    });
+
+    Menus.addSubMenuItem('account', 'settings', {
+      title: 'Edit Profile',
+      state: 'settings.profile'
+    });
+
+    Menus.addSubMenuItem('account', 'settings', {
+      title: 'Edit Profile Picture',
+      state: 'settings.picture'
+    });
+
+    Menus.addSubMenuItem('account', 'settings', {
+      title: 'Change Password',
+      state: 'settings.password'
+    });
+
+    Menus.addSubMenuItem('account', 'settings', {
+      title: 'Manage Social Accounts',
+      state: 'settings.accounts'
+    });
+
+  }
+
+})();
diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js
index e688ad3c..817244e1 100644
--- a/modules/core/client/controllers/header.client.controller.js
+++ b/modules/core/client/controllers/header.client.controller.js
@@ -9,6 +9,9 @@ angular.module('core').controller('HeaderController', ['$scope', '$state', 'Auth
     // Get the topbar menu
     $scope.menu = Menus.getMenu('topbar');
 
+    // Get the account menu
+    $scope.accountMenu = Menus.getMenu('account').items[0];
+
     // Toggle the menu items
     $scope.isCollapsed = false;
     $scope.toggleCollapsibleMenu = function () {
diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html
index dd2bc4ed..7d2cfebf 100644
--- a/modules/core/client/views/header.client.view.html
+++ b/modules/core/client/views/header.client.view.html
@@ -36,17 +36,8 @@
           <span ng-bind="authentication.user.displayName"></span> <b class="caret"></b>
         </a>
         <ul class="dropdown-menu" role="menu">
-          <li ui-sref-active="active">
-            <a ui-sref="settings.profile">Edit Profile</a>
-          </li>
-          <li ui-sref-active="active">
-            <a ui-sref="settings.picture">Change Profile Picture</a>
-          </li>
-          <li ui-sref-active="active" ng-show="authentication.user.provider === 'local'">
-            <a ui-sref="settings.password">Change Password</a>
-          </li>
-          <li ui-sref-active="active">
-            <a ui-sref="settings.accounts">Manage Social Accounts</a>
+          <li ui-sref-active="active" ng-repeat="item in accountMenu.items">
+            <a ui-sref="{{item.state}}" ng-bind="item.title"></a>
           </li>
           <li class="divider"></li>
           <li>