diff --git a/frontend/src/components/UserSettings/UserGMSSwitch.vue b/frontend/src/components/UserSettings/UserGMSSwitch.vue
index 979736e39..355beeff2 100644
--- a/frontend/src/components/UserSettings/UserGMSSwitch.vue
+++ b/frontend/src/components/UserSettings/UserGMSSwitch.vue
@@ -5,7 +5,7 @@
       v-model="gmsAllowed"
       name="check-button"
       switch
-      @change="onSubmit"
+      @change="onChange"
     ></b-form-checkbox>
   </div>
 </template>
@@ -20,7 +20,7 @@ export default {
     }
   },
   methods: {
-    async onSubmit() {
+    async onChange() {
       this.$apollo
         .mutate({
           mutation: updateUserInfos,
diff --git a/frontend/src/pages/Settings.vue b/frontend/src/pages/Settings.vue
index 77a6ef947..c74af6679 100644
--- a/frontend/src/pages/Settings.vue
+++ b/frontend/src/pages/Settings.vue
@@ -184,7 +184,7 @@ export default {
       return firstName === this.firstName && lastName === this.lastName
     },
     isGMS() {
-      return CONFIG.GMS
+      return CONFIG.GMS_ACTIVE
     },
   },
   // TODO: watch: {