diff --git a/vector/src/main/res/layout/fragment_ftue_sign_up_combined.xml b/vector/src/main/res/layout/fragment_ftue_sign_up_combined.xml
index 9986f0d9db..650a052c26 100644
--- a/vector/src/main/res/layout/fragment_ftue_sign_up_combined.xml
+++ b/vector/src/main/res/layout/fragment_ftue_sign_up_combined.xml
@@ -134,9 +134,9 @@
             style="@style/Widget.Vector.Button.Outlined"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/ftue_auth_create_account_edit_server_selection"
             android:paddingLeft="1dp"
             android:paddingRight="1dp"
+            android:text="@string/ftue_auth_create_account_edit_server_selection"
             android:textAllCaps="true"
             app:layout_constraintBottom_toBottomOf="@id/selectedServerDescription"
             app:layout_constraintEnd_toEndOf="@id/createAccountGutterEnd"
@@ -173,7 +173,8 @@
             <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:imeOptions="actionDone"
+                android:imeOptions="actionNext"
+                android:inputType="text"
                 android:maxLines="1" />
 
         </com.google.android.material.textfield.TextInputLayout>