diff --git a/frontend/src/components/identities/AccountGeneralForm.vue b/frontend/src/components/identities/AccountGeneralForm.vue
index 4019e1817..c6fc808b9 100644
--- a/frontend/src/components/identities/AccountGeneralForm.vue
+++ b/frontend/src/components/identities/AccountGeneralForm.vue
@@ -16,12 +16,14 @@
   <label class="m-label">{{ $gettext('First name') }}</label>
   <v-text-field
     v-model="account.first_name"
+    autocomplete="new-password"
     outlined
     dense
     />
   <label class="m-label">{{ $gettext('Last name') }}</label>
   <v-text-field
     v-model="account.last_name"
+    autocomplete="new-password"
     outlined
     dense
     />
diff --git a/frontend/src/components/identities/AccountPasswordForm.vue b/frontend/src/components/identities/AccountPasswordForm.vue
index 92dae4dac..556019394 100644
--- a/frontend/src/components/identities/AccountPasswordForm.vue
+++ b/frontend/src/components/identities/AccountPasswordForm.vue
@@ -119,8 +119,11 @@ export default {
     }
   },
   mounted () {
-    if (this.account && this.account.random_password) {
-      this.updatePassword(true)
+    if (this.account) {
+      this.form.random_password = this.account.random_password
+      if (this.form.random_password) {
+        this.updatePassword(true)
+      }
     }
   }
 }
diff --git a/frontend/src/components/layout/Navbar.vue b/frontend/src/components/layout/Navbar.vue
index 3a5c41b63..cff2f31d4 100644
--- a/frontend/src/components/layout/Navbar.vue
+++ b/frontend/src/components/layout/Navbar.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-navigation-drawer
+<v-navigation-drawer
     v-model="drawer"
     :mini-variant.sync="mini"
     permanent
@@ -211,11 +211,11 @@ export default {
           icon: 'mdi-lock-outline',
           exact: true
         },
-        {
-          text: this.$gettext('Preferences'),
-          icon: 'mdi-tune',
-          exact: true
-        },
+        // {
+        //   text: this.$gettext('Preferences'),
+        //   icon: 'mdi-tune',
+        //   exact: true
+        // },
         {
           text: this.$gettext('Forward'),
           condition: () => this.authUser.mailbox !== null,
diff --git a/frontend/src/views/TwoFA.vue b/frontend/src/views/TwoFA.vue
index 8b273f9c4..1d4843b2c 100644
--- a/frontend/src/views/TwoFA.vue
+++ b/frontend/src/views/TwoFA.vue
@@ -15,16 +15,18 @@
         vid="code"
         rules="required"
         >
-        <label class="m-label"><translate>Two-factor authentication code</translate></label>
-        <v-text-field
-          v-model="code"
-          prepend-icon="mdi-numeric"
-          :error-messages="errors"
-          :hint="'Enter the code from the two-factor app on your mobile device. If you have lost your device, you may enter one of your recovery codes.'|translate"
-          persistent-hint
-          dense
-          outlined
-          />
+        <v-row>
+          <v-col cols="6" offset="3">
+            <label class="m-label"><translate>Two-factor authentication code</translate></label>
+            <v-otp-input
+              v-model="code"
+              length="6"
+              :error-messages="errors"
+              :hint="'Enter the code from the two-factor app on your mobile device. If you have lost your device, you may enter one of your recovery codes.'|translate"
+              persistent-hint
+              />
+          </v-col>
+        </v-row>
       </validation-provider>
     </validation-observer>
     <div class="d-flex justify-center mt-6">