diff --git a/SteamAuth/AuthenticatorLinker.cs b/SteamAuth/AuthenticatorLinker.cs
index a65959ecc6543..d5a99c513a6ee 100644
--- a/SteamAuth/AuthenticatorLinker.cs
+++ b/SteamAuth/AuthenticatorLinker.cs
@@ -101,8 +101,9 @@ public LinkResult AddAuthenticator()
         public FinalizeResult FinalizeAddAuthenticator(string smsCode)
         {
             //The act of checking the SMS code is necessary for Steam to finalize adding the phone number to the account.
-            bool smsCodeGood = this._checkSMSCode(smsCode);
-            if (!smsCodeGood)
+            //Of course, we only want to check it if we're adding a phone number in the first place...
+
+            if (!String.IsNullOrEmpty(this.PhoneNumber) && !this._checkSMSCode(smsCode))
             {
                 return FinalizeResult.BadSMSCode;
             }
@@ -147,7 +148,6 @@ public FinalizeResult FinalizeAddAuthenticator(string smsCode)
 
                 if (finalizeResponse.Response.WantMore)
                 {
-                    smsCodeGood = true;
                     tries++;
                     continue;
                 }