diff --git a/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsSigninView.swift b/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsSigninView.swift
index 7369b5d341..fe64a765ef 100644
--- a/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsSigninView.swift
+++ b/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsSigninView.swift
@@ -159,7 +159,7 @@ struct AccountsSettingsSigninView: View {
 
         switch provider {
         case .github, .githubEnterprise:
-            let config = GitHubTokenConfiguration(personalAccessToken, url: configURL)
+            let config = GitHubTokenConfiguration(personalAccessToken, url: configURL ?? GitURL.githubBaseURL)
             GitHubAccount(config).me { response in
                 switch response {
                 case .success:
@@ -169,7 +169,7 @@ struct AccountsSettingsSigninView: View {
                 }
             }
         case .gitlab, .gitlabSelfHosted:
-            let config = GitLabTokenConfiguration(personalAccessToken, url: configURL)
+            let config = GitLabTokenConfiguration(personalAccessToken, url: configURL ?? GitURL.gitlabBaseURL)
             GitLabAccount(config).me { response in
                 switch response {
                 case .success:
@@ -197,11 +197,11 @@ struct AccountsSettingsSigninView: View {
         } else {
             settings.accounts.sourceControlAccounts.gitAccounts.append(
                 SourceControlAccount(
-                    id: "\(server)_\(username.lowercased())",
+                    id: "\(providerLink)_\(username.lowercased())",
                     name: username,
                     description: provider.name,
                     provider: provider,
-                    serverURL: server,
+                    serverURL: providerLink,
                     urlProtocol: true,
                     sshKey: "",
                     isTokenValid: true