diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedSignUpFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedSignUpFragment.kt
index 6ad98298ea..742b2f1f50 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedSignUpFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedSignUpFragment.kt
@@ -63,7 +63,6 @@ class FtueAuthCombinedSignUpFragment @Inject constructor() : AbstractSSOFtueAuth
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        views.createAccountPasswordInput.editText().hidePassword()
         setupSubmitButton()
 
         views.createAccountRoot.realignPercentagesToParent()
@@ -179,10 +178,10 @@ class FtueAuthCombinedSignUpFragment @Inject constructor() : AbstractSSOFtueAuth
     }
 
     private fun renderSsoProviders(deviceId: String?, ssoProviders: List<SsoIdentityProvider>?) {
+        views.ssoGroup.isVisible = ssoProviders?.isNotEmpty() == true
         views.ssoButtons.mode = SocialLoginButtonsView.Mode.MODE_SIGN_UP
         views.ssoButtons.ssoIdentityProviders = ssoProviders?.sorted()
         views.ssoButtons.listener = SocialLoginButtonsView.InteractionListener { id ->
-            views.ssoGroup.isVisible = ssoProviders?.isNotEmpty() == true
             viewModel.getSsoUrl(
                     redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                     deviceId = deviceId,
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 96cc8b8e4f..9602dd0231 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
@@ -216,6 +216,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:imeOptions="actionDone"
+                android:inputType="textPassword"
                 android:maxLines="1" />
 
         </com.google.android.material.textfield.TextInputLayout>