diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 280c1cfb..d2659c97 100644
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -807,17 +807,18 @@ namespace TShockAPI
 			}
 			else
 			{
-				if (TShock.Config.Settings.DisableUUIDLogin && !TShock.Config.Settings.AllowLoginAnyUsername)
-					args.Player.SendErrorMessage($"Syntax: {Specifier}login <password> - Logs in using your password and character name");
-				else if (TShock.Config.Settings.DisableUUIDLogin && TShock.Config.Settings.AllowLoginAnyUsername)
+				if (TShock.Config.Settings.DisableUUIDLogin)
 				{
-					args.Player.SendErrorMessage($"Syntax: {Specifier}login <password> - Logs in using your password and character name");
-					args.Player.SendErrorMessage($"         {Specifier}login <username> <password> - Logs in using your username and password");
+					if (TShock.Config.Settings.AllowLoginAnyUsername)
+					{
+						args.Player.SendErrorMessage($"Syntax: {Specifier}login <password> - Logs in using your password and character name");
+						args.Player.SendErrorMessage($"         {Specifier}login <username> <password> - Logs in using your username and password");
+					}
+					else
+						args.Player.SendErrorMessage($"Syntax: {Specifier}login <password> - Logs in using your password and character name");
 				}
 				else
-				{
 					args.Player.SendErrorMessage($"Syntax: {Specifier}login - Logs in using your UUID and character name");
-				}
 				args.Player.SendErrorMessage("If you forgot your password, there is no way to recover it.");
 				return;
 			}
@@ -999,14 +1000,17 @@ namespace TShockAPI
 				{
 					args.Player.SendSuccessMessage("Account \"{0}\" has been registered.", account.Name);
 					args.Player.SendSuccessMessage("Your password is {0}.", echoPassword);
-					if (TShock.Config.Settings.DisableUUIDLogin && !TShock.Config.Settings.AllowLoginAnyUsername)
-						args.Player.SendInfoMessage($"Type {Specifier}login {echoPassword} to sign in to your account.");
-					else if (TShock.Config.Settings.DisableUUIDLogin && TShock.Config.Settings.AllowLoginAnyUsername)
-						args.Player.SendInfoMessage($"Type {Specifier}login \"{account.Name}\" {echoPassword} to sign in to your account.");
-					else
+					
+					if (TShock.Config.Settings.DisableUUIDLogin)
 					{
-						args.Player.SendInfoMessage($"Type {Specifier}login to sign in to your account.");
+						if (TShock.Config.Settings.AllowLoginAnyUsername)
+							args.Player.SendInfoMessage($"Type {Specifier}login \"{account.Name}\" {echoPassword} to sign in to your account.");
+						else
+							args.Player.SendInfoMessage($"Type {Specifier}login {echoPassword} to sign in to your account.");
 					}
+					else
+						args.Player.SendSuccessMessage($"Type {Specifier}login to sign in to your account.");
+					
 					TShock.UserAccounts.AddUserAccount(account);
 					TShock.Log.ConsoleInfo("{0} registered an account: \"{1}\".", args.Player.Name, account.Name);
 				}