diff --git a/src/App.vue b/src/App.vue
index 3992080..a131582 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -30,7 +30,7 @@ export default {
     Object.assign(axios.defaults, {
       headers: { Authorization: this.$store.state.user.token },
     });
-    if (this.$store.state.debug) {
+    if (this.$store.state.client.development) {
       this.$buefy.snackbar.open({
         message: this.$t("errors.devBuild"),
         type: "is-warning",
diff --git a/src/components/Footer.vue b/src/components/Footer.vue
index 9023587..747649f 100644
--- a/src/components/Footer.vue
+++ b/src/components/Footer.vue
@@ -108,7 +108,7 @@
     <p style="color: red" v-if="!$store.state.client.secure">!! BEING ACCESSED INSECURELY !!</p>
     <p style="color: red" v-if="checkInsecure && $store.state.client.secure">!! INSECURE WARNING OVERRIDE !!</p>
     <div class="buttons">
-      <b-button class="is-danger" @click="disableInsecure()" v-if="$store.state.debug && !$store.state.secure && !$store.state.client.development">Debug: Disable insecure warning</b-button>
+      <b-button class="is-danger" @click="disableInsecure()" v-if="$store.state.debug && !$store.state.client.secure && !$store.state.client.development">Debug: Disable insecure warning</b-button>
       <b-button type="is-info" @click="langModal = true">{{ $t("languages.title") }}</b-button>
       <b-button type="is-info" @click="feedbackModal = true">Provide Feedback</b-button>
     </div>
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index ad88370..813fae4 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -241,7 +241,7 @@
             {{ $t("navbar.teams") }}
           </b-navbar-item>
           <div
-            v-if="$store.state.debug"
+            v-if="$store.state.client.development"
             class="navbar-item has-dropdown is-hoverable is-info"
           >
             <a class="navbar-link">
diff --git a/src/views/Debug.vue b/src/views/Debug.vue
index b6208ea..0212966 100644
--- a/src/views/Debug.vue
+++ b/src/views/Debug.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="debug">
     <section class="section">
-      <div class="container" v-if="!$store.state.debug">
+      <div class="container" v-if="!$store.state.client.development">
         <div class="columns is-centered">
           <div class="column">
             <div class="box">
@@ -19,7 +19,7 @@
           <div class="column is-7">
             <div class="box" style="overflow: none">
               <div class="title">
-                {{ $t("debug.title") }}: {{ $store.state.debug }}
+                {{ $t("debug.title") }}: {{ $store.state.client.development }}
               </div>
               <hr />
               {{ $t("debug.authUser") }}: {{ $store.state.user.username }}<br />
@@ -27,10 +27,10 @@
               {{ $t("debug.state") }}: {{ $store.state }}<br />
               {{ $t("debug.token") }}: {{ $store.state.user.token }}
             </div>
-            <b-button v-if="$store.state.debug" @click="authTest">{{
+            <b-button v-if="$store.state.client.development" @click="authTest">{{
               $t("debug.auth")
             }}</b-button>
-            <b-button v-if="$store.state.debug" @click="turnOffDebug">{{
+            <b-button v-if="$store.state.client.development" @click="turnOffDebug">{{
               $t("debug.disable")
             }}</b-button>
           </div>
diff --git a/src/views/Register.vue b/src/views/Register.vue
index ae757b2..2b415f1 100644
--- a/src/views/Register.vue
+++ b/src/views/Register.vue
@@ -113,8 +113,8 @@
             Error
           </b-step-item>
           <br>
-          <b-button v-if="$store.state.debug" @click="bypassStage(true)">Debug: Bypass</b-button>
-          <b-button v-if="$store.state.debug" @click="bypassStage(false)">Debug: Back</b-button>
+          <b-button v-if="$store.state.client.development" @click="bypassStage(true)">Debug: Bypass</b-button>
+          <b-button v-if="$store.state.client.development" @click="bypassStage(false)">Debug: Back</b-button>
         </b-steps>
       </div>
     </section>
diff --git a/src/views/SettingsSecurity.vue b/src/views/SettingsSecurity.vue
index d61c83c..a544f02 100644
--- a/src/views/SettingsSecurity.vue
+++ b/src/views/SettingsSecurity.vue
@@ -14,6 +14,8 @@
         <b-input type="password" minlength="6" maxlength="50" v-model="password.newPasswordConfirm" :placeholder="$t('settings.security.password.newPasswordConfirm')"></b-input>
       </b-field>
       <b-button :loading="password.loading" class="is-danger" @click="changePassword">{{$t('settings.security.password.change')}}</b-button>
+      <hr>
+      <div class="subtitle">{{$t('settings.security.email.title')}}</div>
     </div>
   </div>
 </template>