diff --git a/src/main.rs b/src/main.rs
index 403c547..68e7fb7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -275,7 +275,7 @@ fn do_login_impl(
 				login.captcha_text = tui::prompt_captcha_text(&captcha_gid);
 			}
 			Err(LoginError::NeedEmail) => {
-				println!("You should have received an email with a code.");
+				println!("You should have received an email with a code. If you did not, check your spam folder, or abort and try again.");
 				print!("Enter code: ");
 				login.email_code = tui::prompt();
 			}
@@ -362,8 +362,10 @@ fn do_subcmd_setup(
 			username
 		);
 	}
+	info!("Logging in to {}", username);
 	let session = do_login_raw(username).expect("Failed to log in. Account has not been linked.");
 
+	info!("Adding authenticator...");
 	let mut linker = AccountLinker::new(session);
 	let account: SteamGuardAccount;
 	loop {
diff --git a/steamguard/src/accountlinker.rs b/steamguard/src/accountlinker.rs
index a7249fe..078adf6 100644
--- a/steamguard/src/accountlinker.rs
+++ b/steamguard/src/accountlinker.rs
@@ -62,6 +62,9 @@ impl AccountLinker {
 				return Err(AccountLinkError::AuthenticatorPresent);
 			}
 			2 => {
+				// If the user has no phone number on their account, it will always return this status code.
+				// However, this does not mean that this status just means "no phone number". It can also
+				// be literally anything else, so that's why we return GenericFailure here.
 				return Err(AccountLinkError::GenericFailure);
 			}
 			1 => {
@@ -129,7 +132,7 @@ pub enum AccountLinkError {
 	MustConfirmEmail,
 	#[error("Authenticator is already present.")]
 	AuthenticatorPresent,
-	#[error("Steam was unable to link the authenticator to the account. No additional information about this error is available. This is a Steam error, not a steamguard-cli error. Try adding a phone number to your Steam account, or try again later.")]
+	#[error("Steam was unable to link the authenticator to the account. No additional information about this error is available. This is a Steam error, not a steamguard-cli error. Try adding a phone number to your Steam account (which you can do here: https://store.steampowered.com/phone/add), or try again later.")]
 	GenericFailure,
 	#[error(transparent)]
 	Unknown(#[from] anyhow::Error),