diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js
index b0dd737f..26c4036b 100644
--- a/ayanova/src/api/initialize.js
+++ b/ayanova/src/api/initialize.js
@@ -747,39 +747,32 @@ export default function initialize() {
               } else {
                 //Check if overrides and use them here
                 //or else use browser defaults
-                //locale().getBrowserFirstLanguage()
-                //locale().getBrowserTimeZoneName()
-              
 
-/*
-concurrencyToken: 7478681
-​​
-currencyName: "USD"
-​​
-emailAddress: null
-​​
-hour12: true
-​​
-id: 1
-​​
-languageOverride: null
-​​
-timeZoneOverride: null
-​​
-uiColor: "#000000"
-​​
-userId: 1
-*/
-
-
-
-                window.$gz.store.commit("setLocale", {
-                  languageOverride: "en-US",
-                  timeZoneOverride: "America/New_York",
-                  currencyName: "USD",
+                var l = {
+                  languageOverride: null,
+                  timeZoneOverride: null,
+                  currencyName: null,
                   hour12: true
-                });
+                };
 
+                //get language to use, try user set override first, if empty then browser set, if empty then default to en-us
+                l.languageOverride =
+                  res.data.languageOverride ||
+                  window.$gz.locale.getBrowserFirstLanguage() ||
+                  "en-US";
+
+                l.timeZoneOverride =
+                  res.data.timeZoneOverride ||
+                  window.$gz.locale.getBrowserTimeZoneName() ||
+                  "America/New_York";
+
+                //No browser setting for this so meh
+                l.currencyName = res.data.currencyName || "USD";
+                if (res.data.hour12 != null) {
+                  l.hour12 = res.data.hour12;
+                }
+
+                window.$gz.store.commit("setLocale", l);
                 resolve();
               }
             })
diff --git a/ayanova/src/views/home-user-settings.vue b/ayanova/src/views/home-user-settings.vue
index d53c3a23..27e29b7c 100644
--- a/ayanova/src/views/home-user-settings.vue
+++ b/ayanova/src/views/home-user-settings.vue
@@ -297,6 +297,27 @@ export default {
                 vm: vm,
                 dirty: false
               });
+
+              //Set values in store so they are updated immediately for user
+              var l = vm.$store.state.locale;
+
+              if (vm.obj.languageOverride) {
+                l.languageOverride = vm.obj.languageOverride;
+              }
+
+              if (vm.obj.timeZoneOverride) {
+                l.timeZoneOverride = vm.obj.timeZoneOverride;
+              }
+
+              if (vm.obj.currencyName) {
+                l.currencyName = vm.obj.currencyName;
+              }
+
+              if (vm.obj.hour12) {
+                l.hour12 = vm.obj.hour12;
+              }
+
+              window.$gz.store.commit("setLocale", l);
             }
           })
           .catch(function handleSubmitError(error) {