diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt
index 7ef49adec..df1c889e6 100644
--- a/app/src/main/java/org/linphone/core/CorePreferences.kt
+++ b/app/src/main/java/org/linphone/core/CorePreferences.kt
@@ -216,6 +216,10 @@ class CorePreferences @UiThread constructor(private val context: Context) {
     val hideAssistantThirdPartySipAccount: Boolean
         get() = config.getBool("ui", "assistant_hide_third_party_account", false)
 
+    @get:WorkerThread
+    val useUsernameAsSingleSignOnLoginHint: Boolean
+        get() = config.getBool("ui", "use_username_as_sso_login_hint", true)
+
     /* Paths */
 
     @get:WorkerThread
diff --git a/app/src/main/java/org/linphone/ui/main/sso/viewmodel/SingleSignOnViewModel.kt b/app/src/main/java/org/linphone/ui/main/sso/viewmodel/SingleSignOnViewModel.kt
index 70e609b3c..faa4f6571 100644
--- a/app/src/main/java/org/linphone/ui/main/sso/viewmodel/SingleSignOnViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/sso/viewmodel/SingleSignOnViewModel.kt
@@ -35,6 +35,7 @@ import net.openid.appauth.AuthorizationServiceConfiguration
 import net.openid.appauth.ResponseTypeValues
 import org.json.JSONObject
 import org.linphone.LinphoneApplication.Companion.coreContext
+import org.linphone.LinphoneApplication.Companion.corePreferences
 import org.linphone.core.Factory
 import org.linphone.core.tools.Log
 import org.linphone.ui.GenericViewModel
@@ -136,7 +137,8 @@ class SingleSignOnViewModel : GenericViewModel() {
                 // an invalid grant error with description "Session not active"
                 authRequestBuilder.setScopes("offline_access")
 
-                if (username.isNotEmpty()) {
+                if (username.isNotEmpty() && corePreferences.useUsernameAsSingleSignOnLoginHint) {
+                    Log.i("$TAG Using username [$username] as login hint")
                     authRequestBuilder.setLoginHint(username)
                 }