diff --git a/src/GitHub.Api/Application/ApiClient.cs b/src/GitHub.Api/Application/ApiClient.cs
index 01d189def..b73f63aca 100644
--- a/src/GitHub.Api/Application/ApiClient.cs
+++ b/src/GitHub.Api/Application/ApiClient.cs
@@ -255,7 +255,7 @@ private GitHubUser GetValidatedGitHubUser(Connection keychainConnection, IKeycha
                 {
                     var login = ret.Output[1];
 
-                    if (login != keychainConnection.Username)
+                    if (!string.Equals(login, keychainConnection.Username, StringComparison.InvariantCultureIgnoreCase))
                     {
                         logger.Trace("LoadKeychainInternal: Api username does not match");
                         throw new TokenUsernameMismatchException(keychainConnection.Username, login);
diff --git a/src/GitHub.Api/Authentication/LoginManager.cs b/src/GitHub.Api/Authentication/LoginManager.cs
index 9a67986af..8ab6f9f18 100644
--- a/src/GitHub.Api/Authentication/LoginManager.cs
+++ b/src/GitHub.Api/Authentication/LoginManager.cs
@@ -73,7 +73,7 @@ public LoginResultData Login(
 
                     if (loginResultData.Code == LoginResultCodes.Success)
                     {
-                        username = RetrieveUsername(loginResultData, username);
+                        username = RetrieveUsername();
                         keychainAdapter.Update(loginResultData.Token, username);
                         keychain.SaveToSystem(host);
                     }
@@ -113,7 +113,7 @@ public LoginResultData ContinueLogin(LoginResultData loginResultData, string two
                     }
 
                     keychainAdapter.Update(loginResultData.Token, username);
-                    username = RetrieveUsername(loginResultData, username);
+                    username = RetrieveUsername();
                     keychainAdapter.Update(loginResultData.Token, username);
                     keychain.SaveToSystem(host);
 
@@ -180,13 +180,8 @@ private LoginResultData TryLogin(
             return new LoginResultData(LoginResultCodes.Failed, ret.GetApiErrorMessage() ?? "Failed.", host);
         }
 
-        private string RetrieveUsername(LoginResultData loginResultData, string username)
+        private string RetrieveUsername()
         {
-            if (!username.Contains("@"))
-            {
-                return username;
-            }
-
             var octorunTask = new OctorunTask(taskManager.Token, keychain, environment, "validate")
                 .Configure(processManager);