diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt
index ac2e2b7fa9..c28dca8dbf 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt
@@ -167,13 +167,19 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable {
         val crossSigningEnabledOnAccount = myCrossSigningKeys != null
 
         if (!crossSigningEnabledOnAccount && !sharedActionViewModel.isAccountCreation) {
-            // We need to ask
-            promptSecurityEvent(
-                    session,
-                    R.string.upgrade_security,
-                    R.string.security_prompt_text
-            ) {
-                it.navigator.upgradeSessionSecurity(it)
+            // Do not propose for SSO accounts, because we do not support yet confirming account credentials using SSO
+            if (session.getHomeServerCapabilities().canChangePassword) {
+                // We need to ask
+                promptSecurityEvent(
+                        session,
+                        R.string.upgrade_security,
+                        R.string.security_prompt_text
+                ) {
+                    it.navigator.upgradeSessionSecurity(it)
+                }
+            } else {
+                // Do not do it again
+                sharedActionViewModel.hasDisplayedCompleteSecurityPrompt = true
             }
         } else if (myCrossSigningKeys?.isTrusted() == false) {
             // We need to ask