diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs
index a18739950..393db9445 100755
--- a/ArchiSteamFarm/Bot.cs
+++ b/ArchiSteamFarm/Bot.cs
@@ -49,6 +49,7 @@ namespace ArchiSteamFarm {
 		private const char DefaultBackgroundKeysRedeemerSeparator = '\t';
 		private const byte LoginCooldownInMinutes = 25; // Captcha disappears after around 20 minutes, so we make it 25
 		private const uint LoginID = 1242; // This must be the same for all ASF bots and all ASF processes
+		private const byte MaxInvalidPasswordFailures = WebBrowser.MaxTries; // Max InvalidPassword failures in a row before we determine that our password is invalid (because Steam wrongly returns those, of course)
 		private const ushort MaxMessageLength = 5000; // This is a limitation enforced by Steam
 		private const byte MaxTwoFactorCodeFailures = WebBrowser.MaxTries; // Max TwoFactorCodeMismatch failures in a row before we determine that our 2FA credentials are invalid (because Steam wrongly returns those, of course)
 		private const byte RedeemCooldownInHours = 1; // 1 hour since first redeem attempt, this is a limitation enforced by Steam
@@ -209,6 +210,7 @@ namespace ArchiSteamFarm {
 		private bool FirstTradeSent;
 		private Timer GamesRedeemerInBackgroundTimer;
 		private byte HeartBeatFailures;
+		private byte InvalidPasswordFailures;
 		private EResult LastLogOnResult;
 		private DateTime LastLogonSessionReplaced;
 		private bool LibraryLocked;
@@ -2183,18 +2185,19 @@ namespace ArchiSteamFarm {
 
 			switch (lastLogOnResult) {
 				case EResult.AccountDisabled:
-				case EResult.InvalidPassword when string.IsNullOrEmpty(BotDatabase.LoginKey):
 					// Do not attempt to reconnect, those failures are permanent
 					return;
-				case EResult.InvalidPassword:
+				case EResult.InvalidPassword when !string.IsNullOrEmpty(BotDatabase.LoginKey):
 					BotDatabase.LoginKey = null;
 					ArchiLogger.LogGenericInfo(Strings.BotRemovedExpiredLoginKey);
 
 					break;
+				case EResult.InvalidPassword:
 				case EResult.NoConnection:
 				case EResult.ServiceUnavailable:
 				case EResult.Timeout:
 				case EResult.TryAnotherCM:
+				case EResult.TwoFactorCodeMismatch:
 					await Task.Delay(5000).ConfigureAwait(false);
 
 					break;
@@ -2522,7 +2525,7 @@ namespace ArchiSteamFarm {
 					ArchiLogger.LogGenericInfo(string.Format(Strings.BotLoggedOn, SteamID + (!string.IsNullOrEmpty(callback.VanityURL) ? "/" + callback.VanityURL : "")));
 
 					// Old status for these doesn't matter, we'll update them if needed
-					TwoFactorCodeFailures = 0;
+					InvalidPasswordFailures = TwoFactorCodeFailures = 0;
 					LibraryLocked = PlayingBlocked = false;
 
 					if (PlayingWasBlocked && (PlayingWasBlockedTimer == null)) {
@@ -2659,17 +2662,25 @@ namespace ArchiSteamFarm {
 				case EResult.TwoFactorCodeMismatch:
 					ArchiLogger.LogGenericWarning(string.Format(Strings.BotUnableToLogin, callback.Result, callback.ExtendedResult));
 
-					if ((callback.Result == EResult.TwoFactorCodeMismatch) && HasMobileAuthenticator) {
-						if (++TwoFactorCodeFailures >= MaxTwoFactorCodeFailures) {
+					switch (callback.Result) {
+						case EResult.InvalidPassword when string.IsNullOrEmpty(BotDatabase.LoginKey) && (++InvalidPasswordFailures >= MaxInvalidPasswordFailures):
+							InvalidPasswordFailures = 0;
+							ArchiLogger.LogGenericError(string.Format(Strings.BotInvalidPasswordDuringLogin, MaxInvalidPasswordFailures));
+							Stop();
+
+							break;
+						case EResult.TwoFactorCodeMismatch when HasMobileAuthenticator && (++TwoFactorCodeFailures >= MaxTwoFactorCodeFailures):
 							TwoFactorCodeFailures = 0;
 							ArchiLogger.LogGenericError(string.Format(Strings.BotInvalidAuthenticatorDuringLogin, MaxTwoFactorCodeFailures));
 							Stop();
-						}
+
+							break;
 					}
 
 					break;
 				default:
 					// Unexpected result, shutdown immediately
+					ArchiLogger.LogGenericError(string.Format(Strings.WarningUnknownValuePleaseReport, nameof(callback.Result), callback.Result));
 					ArchiLogger.LogGenericError(string.Format(Strings.BotUnableToLogin, callback.Result, callback.ExtendedResult));
 					Stop();
 
diff --git a/ArchiSteamFarm/Localization/Strings.Designer.cs b/ArchiSteamFarm/Localization/Strings.Designer.cs
index b98afc3bf..a5b2f3992 100644
--- a/ArchiSteamFarm/Localization/Strings.Designer.cs
+++ b/ArchiSteamFarm/Localization/Strings.Designer.cs
@@ -375,6 +375,15 @@ namespace ArchiSteamFarm.Localization {
             }
         }
         
+        /// <summary>
+        /// Wyszukuje zlokalizowany ciąg podobny do ciągu Received InvalidPassword error code {0} times in a row. Your password for this account is most likely wrong, aborting!.
+        /// </summary>
+        public static string BotInvalidPasswordDuringLogin {
+            get {
+                return ResourceManager.GetString("BotInvalidPasswordDuringLogin", resourceCulture);
+            }
+        }
+        
         /// <summary>
         /// Wyszukuje zlokalizowany ciąg podobny do ciągu Bot has level {0}..
         /// </summary>
diff --git a/ArchiSteamFarm/Localization/Strings.resx b/ArchiSteamFarm/Localization/Strings.resx
index 9da35502c..2a9bf1cec 100644
--- a/ArchiSteamFarm/Localization/Strings.resx
+++ b/ArchiSteamFarm/Localization/Strings.resx
@@ -728,4 +728,8 @@ Process uptime: {1}</value>
     <value>The trade offer {0} is determined to be {1} due to {2}.</value>
     <comment>{0} will be replaced by trade offer ID (number), {1} will be replaced by internal ASF enum name, {2} will be replaced by technical reason why the trade was determined to be in this state</comment>
   </data>
+  <data name="BotInvalidPasswordDuringLogin" xml:space="preserve">
+    <value>Received InvalidPassword error code {0} times in a row. Your password for this account is most likely wrong, aborting!</value>
+    <comment>{0} will be replaced by maximum allowed number of failed login attempts</comment>
+  </data>
 </root>
\ No newline at end of file