diff --git a/CHANGES.md b/CHANGES.md
index 2b36909c33..03817341bc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,7 +7,7 @@ Features ✨:
 Improvements 🙌:
  - Invite member(s) to an existing room (#1276)
  - Improve notification accessibility with ticker text (#1226)
- - Support homeserver discovery from MXID (#476)
+ - Support homeserver discovery from MXID (DISABLED: waiting for design) (#476)
 
 Bugfix 🐛:
  - Sometimes the same device appears twice in the list of devices of a user (#1329)
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index dc04f202fa..ba74ce26f8 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -16,7 +16,9 @@
         style="@style/LoginFormScrollView"
         tools:ignore="MissingConstraints">
 
-        <androidx.constraintlayout.widget.ConstraintLayout style="@style/LoginFormContainer">
+        <androidx.constraintlayout.widget.ConstraintLayout
+            style="@style/LoginFormContainer"
+            android:paddingBottom="@dimen/layout_vertical_margin">
 
             <TextView
                 android:id="@+id/loginServerTitle"
@@ -197,6 +199,7 @@
                 android:gravity="start"
                 android:text="@string/login_connect_using_matrix_id_notice"
                 android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:visibility="gone"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginServerSubmit" />
@@ -207,6 +210,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:text="@string/login_connect_using_matrix_id_submit"
+                android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"