diff --git a/src/account/HomePage.vue b/src/account/HomePage.vue
index 639f79f..14be369 100644
--- a/src/account/HomePage.vue
+++ b/src/account/HomePage.vue
@@ -15,6 +15,7 @@ export default {
             account: state => state.account,
             users: state => state.users.all
         }),
+        ...mapState('account', ['locale']),
         ...mapState('system', ['messages', 'detectedTimezone', 'detectedLocale'])
     },
     methods: {
@@ -25,9 +26,7 @@ export default {
         ...mapActions('system', ['loadMessages', 'loadTimezones', 'detectTimezone', 'detectLocale'])
     },
     created () {
-        // todo: allow user to choose locale
-        const locale = 'detect';
-        this.loadMessages('post_auth', locale);
+        this.loadMessages('post_auth', this.locale);
         this.detectLocale();
         this.detectTimezone();
     }
diff --git a/src/admin/ModelSetupPage.vue b/src/admin/ModelSetupPage.vue
index 85c6092..a77650b 100644
--- a/src/admin/ModelSetupPage.vue
+++ b/src/admin/ModelSetupPage.vue
@@ -5,7 +5,7 @@
             <div class="form-group">
                 <label for="configType">{{messages.field_label_entity_type}}</label>
                 <select v-model="configType" name="configType" class="form-control">
-                    <option v-for="opt in system.configs.entityClasses" v-bind:value="opt">{{opt}}</option>
+                    <option v-for="opt in this.configs.entityClasses" v-bind:value="opt.value">{{opt.name}}</option>
                 </select>
             </div>
         </form>
@@ -18,18 +18,17 @@
     export default {
         data() {
             return {
-                configType: system.configs.entityClasses[0]
+                configType: 'Account'
             };
         },
         computed: {
+            ...mapState('account', ['locale']),
             ...mapState('system', ['configs', 'messages'])
         },
         created () {
-            const locale = 'detect';
-            this.loadSystemConfigs();  // determine if we can show the registration link
-            this.loadMessages('pre_auth', locale);
-            this.loadMessages('post_auth', locale);
-
+            this.loadSystemConfigs(); // ensure config.entityClasses is refreshed
+            this.loadMessages('pre_auth', this.locale);
+            this.loadMessages('post_auth', this.locale);
         },
         methods: {
             // ...mapActions('system', ['loadIsActivated', 'activate']),