diff --git a/web/src/views/admin/Settings.vue b/web/src/views/admin/Settings.vue
index e4a0c7d..96bbe04 100644
--- a/web/src/views/admin/Settings.vue
+++ b/web/src/views/admin/Settings.vue
@@ -4,7 +4,8 @@
         <li v-for="[template, index] in localChanges" :key="template.id">
             <b>{{ template.name }}</b><br>
             <FormatedText :value="template.message" :format="formatText" class="template-message"
-                          @input="changeMessageTemplate(template.id, $event)"/><br>
+                          @input="changeMessageTemplate(template.id, $event)"/>
+            <br>
             <button class="btn btn-primary"
                     :disabled="template.message !== messageTemplates[index].message">Reset
             </button>
@@ -52,11 +53,12 @@ export default {
         }
     },
     mounted() {
-        this.fetchMessageTemplates();
-        this.fetchMessageTemplateVariables();
-        this.localChanges = this.messageTemplates.map(template => {
-            return {id: template.id, message: template.message, name: template.name};
+        this.fetchMessageTemplates().then(() => {
+            this.localChanges = this.messageTemplates.map(template => {
+                return {id: template.id, message: template.message, name: template.name};
+            });
         });
+        this.fetchMessageTemplateVariables();
     },
 };
 </script>