diff --git a/Linphone/Core/CorePreferences.swift b/Linphone/Core/CorePreferences.swift
index 4ab41d9cb..0d22023b9 100644
--- a/Linphone/Core/CorePreferences.swift
+++ b/Linphone/Core/CorePreferences.swift
@@ -339,6 +339,15 @@ class CorePreferences {
 		}
 	}
 	
+	var singleSignOnClientId: String {
+		get {
+			config.getString(section: "app", key: "oidc_client_id", defaultString: "linphone")
+		}
+		set {
+			config.setString(section: "app", key: "oidc_client_id", value: newValue)
+		}
+	}
+	
 	var teamID: String {
 		get {
 			config.getString(section: "app", key: "team_id", defaultString: "")
diff --git a/Linphone/GeneratedGit.swift b/Linphone/GeneratedGit.swift
index d9c1783d6..83f45a104 100644
--- a/Linphone/GeneratedGit.swift
+++ b/Linphone/GeneratedGit.swift
@@ -2,6 +2,6 @@ import Foundation
 
 public enum AppGitInfo {
     public static let branch = "master"
-    public static let commit = "bfb4ac3c2"
+    public static let commit = "e066ff4ee"
     public static let tag = "6.1.0-alpha"
 }
diff --git a/Linphone/Utils/SingleSignOn/SingleSignOnManager.swift b/Linphone/Utils/SingleSignOn/SingleSignOnManager.swift
index 4d3afe523..0c311d2da 100644
--- a/Linphone/Utils/SingleSignOn/SingleSignOnManager.swift
+++ b/Linphone/Utils/SingleSignOn/SingleSignOnManager.swift
@@ -26,7 +26,7 @@ class SingleSignOnManager {
 	static let shared = SingleSignOnManager()
 
 	private let TAG = "[SSO]"
-	private let clientId = "linphone"
+	private let clientId = AppServices.corePreferences.singleSignOnClientId
 	private let userDefaultSSOKey = "sso-authstate"
 	let ssoRedirectUri = URL(string: "org.linphone:/openidcallback")!
 	private var singleSignOnUrl = ""
@@ -87,6 +87,7 @@ class SingleSignOnManager {
 					Log.error("\(self.TAG) Error retrieving discovery document: \(error?.localizedDescription ?? "Unknown error")")
 					return
 				}
+				
 				let request = OIDTokenRequest(
 					configuration: configuration,
 					grantType: OIDGrantTypeRefreshToken,