diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0261b86b..ad93f6b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 This is the rolling changelog for TShock for Terraria. Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large.
 
+## Unreleased
+
+* Auth system kicks players if system is disabled. (@nicatronTg)
+* Fixed /login permitting multiple logins without a logout in between. (@nicatronTg)
+
 ## TShock 4.3.6 (Pre-Release)
 
 * API: NPCs shoot the right way (@WhiteXZ)
diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index f196bd7e..1833f5c0 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -735,6 +735,12 @@ namespace TShockAPI
 				TShock.Utils.Kick(args.Player, "Too many invalid login attempts.");
 				return;
 			}
+
+			if (args.Player.IsLoggedIn)
+			{
+				args.Player.SendErrorMessage("You are already logged in, and cannot login again.");
+				return;
+			}
             
 			User user = TShock.Users.GetUserByName(args.Player.Name);
 			string password = "";