diff --git a/src/qml/Pages/AddAccount/AddAccount.qml b/src/qml/Pages/AddAccount/AddAccount.qml
index aee5e38c..8952c9d5 100644
--- a/src/qml/Pages/AddAccount/AddAccount.qml
+++ b/src/qml/Pages/AddAccount/AddAccount.qml
@@ -5,7 +5,7 @@ import "../../Base"
 HPage {
     HTabbedBoxes {
         tabModel: [
-            qsTr("Sign in"), qsTr("Register"), qsTr("Recovery"),
+            qsTr("Sign in"), qsTr("Register"), qsTr("Reset"),
         ]
 
         SignIn { Component.onCompleted: forceActiveFocus() }
diff --git a/src/qml/Pages/AddAccount/SignIn.qml b/src/qml/Pages/AddAccount/SignIn.qml
index fdad3a81..656cbe39 100644
--- a/src/qml/Pages/AddAccount/SignIn.qml
+++ b/src/qml/Pages/AddAccount/SignIn.qml
@@ -103,6 +103,7 @@ HBox {
     }
 
     HRowLayout {
+        visible: false  // TODO
         spacing: theme.spacing * 1.25
         Layout.alignment: Qt.AlignHCenter
 
@@ -123,6 +124,25 @@ HBox {
         }
     }
 
+    HTextField {
+        id: idField
+        placeholderText: qsTr(
+            signInWith === "email" ? "Email" :
+            signInWith === "phone" ? "Phone" :
+            "Username"
+        )
+
+        Layout.fillWidth: true
+    }
+
+    HTextField {
+        id: passwordField
+        placeholderText: qsTr("Password")
+        echoMode: HTextField.Password
+
+        Layout.fillWidth: true
+    }
+
     HTextField {
         id: serverField
         placeholderText: qsTr("Homeserver URL")
@@ -156,25 +176,6 @@ HBox {
             knownServers.includes(cleanText)
     }
 
-    HTextField {
-        id: idField
-        placeholderText: qsTr(
-            signInWith === "email" ? "Email" :
-            signInWith === "phone" ? "Phone" :
-            "Username"
-        )
-
-        Layout.fillWidth: true
-    }
-
-    HTextField {
-        id: passwordField
-        placeholderText: qsTr("Password")
-        echoMode: HTextField.Password
-
-        Layout.fillWidth: true
-    }
-
     HCheckBox {
         id: rememberAccount
         text: qsTr("Remember my account")