diff --git a/src/org/apollo/net/codec/login/LoginDecoder.java b/src/org/apollo/net/codec/login/LoginDecoder.java
index 71bc853b..1e87d17c 100644
--- a/src/org/apollo/net/codec/login/LoginDecoder.java
+++ b/src/org/apollo/net/codec/login/LoginDecoder.java
@@ -179,8 +179,12 @@ public final class LoginDecoder extends StatefulFrameDecoder<LoginDecoderState>
 			String username = BufferUtil.readString(securePayload);
 			String password = BufferUtil.readString(securePayload);
 
-			if (username.length() > 12 || password.length() > 20) {
-				throw new Exception("Username or password too long.");
+			if (!(username.length() < 13 || password.length() > 5 && password.length() < 21)) {
+				throw new Exception("Invalid username or password length.");
+			}
+			
+			if (username.isEmpty() || password.isEmpty()) {
+				throw new Exception("Invalid username or password.");
 			}
 
 			int[] seed = new int[4];
@@ -209,4 +213,4 @@ public final class LoginDecoder extends StatefulFrameDecoder<LoginDecoderState>
 		}
 	}
 
-}
\ No newline at end of file
+}