diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 0f193e01..07152a2e 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -48,6 +48,7 @@ CURRENT TODOs
 SHELL / NAV / MENUS / LAYOUT
 
 
+TODO: Move user locale and set login password into"user settings" single sub menu, set pw is too rare to be surfaced on the main nav panel
 
 TODO: Change api docs regarding using api explorer, no longer necessary to put Bearer in the string
 
diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js
index d3d63b03..b964d463 100644
--- a/ayanova/src/api/initialize.js
+++ b/ayanova/src/api/initialize.js
@@ -102,21 +102,30 @@ export default function initialize() {
               key: key++
             });
 
-            //USER LOCALE
+            //USER SETTINGS
             sub.push({
-              title: window.$gz.locale.get("Locale"),
-              icon: "language",
-              route: "/home-locale",
+              title: window.$gz.locale.get("UserSettings"),
+              icon: "user-cog",
+              route: "/home-user-settings",
               key: key++
             });
 
-            //SET LOGIN
-            sub.push({
-              title: window.$gz.locale.get("SetLoginPassword"),
-              icon: "key",
-              route: "/home-password",
-              key: key++
-            });
+            //Moved these two into user settings 
+            // //USER LOCALE
+            // sub.push({
+            //   title: window.$gz.locale.get("Locale"),
+            //   icon: "language",
+            //   route: "/home-locale",
+            //   key: key++
+            // });
+
+            // //SET LOGIN
+            // sub.push({
+            //   title: window.$gz.locale.get("SetLoginPassword"),
+            //   icon: "key",
+            //   route: "/home-password",
+            //   key: key++
+            // });
 
             //USER NOTIFICATION SUBSCRIPTIONS
             if (
diff --git a/ayanova/src/api/locale.js b/ayanova/src/api/locale.js
index 6bcf89cb..d56546c5 100644
--- a/ayanova/src/api/locale.js
+++ b/ayanova/src/api/locale.js
@@ -51,6 +51,7 @@ export default {
     "Dashboard",
     "Schedule",
     "MemoList",
+    "UserSettings",
     "Locale",
     "SetLoginPassword",
     "NotifySubscriptionList",
diff --git a/ayanova/src/router.js b/ayanova/src/router.js
index 98bc55f5..262047e4 100644
--- a/ayanova/src/router.js
+++ b/ayanova/src/router.js
@@ -101,6 +101,12 @@ export default new Router({
       component: () =>
         import(/* webpackChunkName: "home" */ "./views/home-reminders.vue")
     },
+    {
+      path: "/home-user-settings",
+      name: "home-user-settings",
+      component: () =>
+        import(/* webpackChunkName: "home" */ "./views/home-user-settings.vue")
+    },
     {
       path: "/home-locale",
       name: "home-locale",