diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index bb6bd8c1..9c3a2c79 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -1,5 +1,7 @@
+import i18n from '@/lang'
 import { fetchSettings, updateSettings, uploadMedia } from '@/api/settings'
 import { filterIgnored, parseTuples, valueHasTuples, wrapConfig } from './normalizers'
+import { Message } from 'element-ui'
 
 const settings = {
   state: {
@@ -124,10 +126,17 @@ const settings = {
     async SubmitChanges({ getters, commit, state }, data) {
       const filteredSettings = filterIgnored(state.settings, state.ignoredIfNotEnabled)
       const configs = data || wrapConfig(filteredSettings)
-      const response = await updateSettings(configs, getters.authHost, getters.token)
-      if (data) {
+      try {
+        const response = await updateSettings(configs, getters.authHost, getters.token)
         commit('SET_SETTINGS', response.data.configs)
+      } catch (_e) {
+        return
       }
+      Message({
+        message: i18n.t('settings.success'),
+        type: 'success',
+        duration: 5 * 1000
+      })
     },
     UpdateSettings({ commit }, { tab, data }) {
       commit('UPDATE_SETTINGS', { tab, data })
diff --git a/src/views/settings/components/ActivityPub.vue b/src/views/settings/components/ActivityPub.vue
index 903e34fe..2067be0a 100644
--- a/src/views/settings/components/ActivityPub.vue
+++ b/src/views/settings/components/ActivityPub.vue
@@ -37,7 +37,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 
 export default {
   name: 'ActivityPub',
@@ -57,16 +56,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Authentication.vue b/src/views/settings/components/Authentication.vue
index a2084327..da458d5c 100644
--- a/src/views/settings/components/Authentication.vue
+++ b/src/views/settings/components/Authentication.vue
@@ -232,7 +232,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 
 export default {
   name: 'Authentication',
@@ -259,16 +258,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/AutoLinker.vue b/src/views/settings/components/AutoLinker.vue
index e84f3394..0b151467 100644
--- a/src/views/settings/components/AutoLinker.vue
+++ b/src/views/settings/components/AutoLinker.vue
@@ -52,7 +52,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 
 export default {
   name: 'AutoLinker',
@@ -107,16 +106,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Captcha.vue b/src/views/settings/components/Captcha.vue
index 4bff5c0b..bdd7ec91 100644
--- a/src/views/settings/components/Captcha.vue
+++ b/src/views/settings/components/Captcha.vue
@@ -33,7 +33,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 
 export default {
   name: 'Captcha',
@@ -53,16 +52,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Database.vue b/src/views/settings/components/Database.vue
index ab9d42a8..c0748f89 100644
--- a/src/views/settings/components/Database.vue
+++ b/src/views/settings/components/Database.vue
@@ -135,7 +135,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -157,16 +156,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Endpoint.vue b/src/views/settings/components/Endpoint.vue
index aa1f661a..4cfd5bde 100644
--- a/src/views/settings/components/Endpoint.vue
+++ b/src/views/settings/components/Endpoint.vue
@@ -172,7 +172,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 import { options } from './options'
 import AceEditor from 'vue2-ace-editor'
 import 'brace/mode/elixir'
@@ -246,16 +245,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Esshd.vue b/src/views/settings/components/Esshd.vue
index 512ca7a4..ded2cec8 100644
--- a/src/views/settings/components/Esshd.vue
+++ b/src/views/settings/components/Esshd.vue
@@ -55,7 +55,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -82,16 +81,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Frontend.vue b/src/views/settings/components/Frontend.vue
index eac9b478..6282384b 100644
--- a/src/views/settings/components/Frontend.vue
+++ b/src/views/settings/components/Frontend.vue
@@ -318,7 +318,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 import { options } from './options'
 
 export default {
@@ -419,16 +418,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Gopher.vue b/src/views/settings/components/Gopher.vue
index b4f0b2d4..a173ba96 100644
--- a/src/views/settings/components/Gopher.vue
+++ b/src/views/settings/components/Gopher.vue
@@ -23,7 +23,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -43,16 +42,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Http.vue b/src/views/settings/components/Http.vue
index 08e8da7c..f6c66311 100644
--- a/src/views/settings/components/Http.vue
+++ b/src/views/settings/components/Http.vue
@@ -129,7 +129,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -161,16 +160,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Instance.vue b/src/views/settings/components/Instance.vue
index 05539e13..feab3597 100644
--- a/src/views/settings/components/Instance.vue
+++ b/src/views/settings/components/Instance.vue
@@ -337,7 +337,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 import { options } from './options'
 
@@ -396,16 +395,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/JobQueue.vue b/src/views/settings/components/JobQueue.vue
index f18cc853..a8fe0c77 100644
--- a/src/views/settings/components/JobQueue.vue
+++ b/src/views/settings/components/JobQueue.vue
@@ -51,7 +51,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -72,16 +71,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Logger.vue b/src/views/settings/components/Logger.vue
index a58c286c..6be523f5 100644
--- a/src/views/settings/components/Logger.vue
+++ b/src/views/settings/components/Logger.vue
@@ -173,7 +173,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 import { options } from './options'
 
 export default {
@@ -212,16 +211,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/MRF.vue b/src/views/settings/components/MRF.vue
index 043f3b7d..fd581e97 100644
--- a/src/views/settings/components/MRF.vue
+++ b/src/views/settings/components/MRF.vue
@@ -145,7 +145,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 import { options } from './options'
 
 export default {
@@ -257,16 +256,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Mailer.vue b/src/views/settings/components/Mailer.vue
index 87979815..fde11492 100644
--- a/src/views/settings/components/Mailer.vue
+++ b/src/views/settings/components/Mailer.vue
@@ -202,7 +202,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 import { options } from './options'
 import AceEditor from 'vue2-ace-editor'
@@ -249,16 +248,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/MediaProxy.vue b/src/views/settings/components/MediaProxy.vue
index 0c0a73a8..86d7a235 100644
--- a/src/views/settings/components/MediaProxy.vue
+++ b/src/views/settings/components/MediaProxy.vue
@@ -75,7 +75,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 import { options } from './options'
 
@@ -126,16 +125,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Metadata.vue b/src/views/settings/components/Metadata.vue
index 2f63ddd0..7631fe2e 100644
--- a/src/views/settings/components/Metadata.vue
+++ b/src/views/settings/components/Metadata.vue
@@ -52,7 +52,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 
 export default {
   name: 'Metadata',
@@ -72,16 +71,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Other.vue b/src/views/settings/components/Other.vue
index 99ab16ff..c285309b 100644
--- a/src/views/settings/components/Other.vue
+++ b/src/views/settings/components/Other.vue
@@ -30,7 +30,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -65,16 +64,8 @@ export default {
       }, {})
       this.updateSetting(updatedValue, 'types', 'value')
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     },
     parseMimeTypes(value, inputType, index) {
       const updatedValue = this.mimeTypes.reduce((acc, el, i) => {
diff --git a/src/views/settings/components/RateLimiters.vue b/src/views/settings/components/RateLimiters.vue
index 491ad51b..943d9774 100644
--- a/src/views/settings/components/RateLimiters.vue
+++ b/src/views/settings/components/RateLimiters.vue
@@ -223,7 +223,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -379,16 +378,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Upload.vue b/src/views/settings/components/Upload.vue
index 776c9ed6..f9cffe33 100644
--- a/src/views/settings/components/Upload.vue
+++ b/src/views/settings/components/Upload.vue
@@ -144,7 +144,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 import { options } from './options'
 
@@ -207,16 +206,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/WebPush.vue b/src/views/settings/components/WebPush.vue
index 7dbe87ea..4e5a45b7 100644
--- a/src/views/settings/components/WebPush.vue
+++ b/src/views/settings/components/WebPush.vue
@@ -21,7 +21,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -41,16 +40,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }