diff --git a/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java b/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java
index 7057a0eaa30ec29115efc9a0d2594ad49b02ee06..cc462f9c3af707ae92c36f96de3bc54f6c465d2d 100644
--- a/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java
+++ b/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java
@@ -147,7 +147,7 @@ public class CreateNewTournamentState extends State {
         innerTable.setBackground(backgroundTableBlueRounded);
 
         innerTable.add(makeRow(nameLabel, nameDialog));
-        nameInputField.setMaxLength(10);
+        nameInputField.setMaxLength(9);
         innerTable.add(nameInputField).size(nameFieldWidth, inputFieldHeight);
         innerTable.row();
         removeKeyPadAtTouch();
diff --git a/frontend/core/src/com/gameware/game/states/LoginState.java b/frontend/core/src/com/gameware/game/states/LoginState.java
index b77f1deb4eb0cfc9ae44cbc23ef7da27ace68746..78fc4da2675dd5ac29154a1ebbff2ab988c3ab66 100644
--- a/frontend/core/src/com/gameware/game/states/LoginState.java
+++ b/frontend/core/src/com/gameware/game/states/LoginState.java
@@ -216,6 +216,13 @@ public class LoginState extends State {
 
         String username = usernameInputField.getText();
         String password = passwordInputField.getText();
+
+        //Check if username = Username
+        if(username.equals("Username")){
+            errorLabel.setText(wrongLoginText);
+            return;
+        }
+
         try {
             Player player = QueryIntermediate.loginPlayer(username, password);