diff --git a/src/main/java/emu/grasscutter/Config.java b/src/main/java/emu/grasscutter/Config.java
index 983524223..8573c83ba 100644
--- a/src/main/java/emu/grasscutter/Config.java
+++ b/src/main/java/emu/grasscutter/Config.java
@@ -53,5 +53,6 @@ public final class Config {
 		public int MaxEntityLimit = 1000; // Max entity limit per world. // TODO: Enforce later.
 		public int[] WelcomeEmotes = {2007, 1002, 4010};
 		public String WelcomeMotd = "Welcome to Grasscutter emu";
+		public boolean AutomaticallyCreateAccounts = false;
 	}
 }
diff --git a/src/main/java/emu/grasscutter/commands/CommandMap.java b/src/main/java/emu/grasscutter/commands/CommandMap.java
index a802551ce..5d7d1110b 100644
--- a/src/main/java/emu/grasscutter/commands/CommandMap.java
+++ b/src/main/java/emu/grasscutter/commands/CommandMap.java
@@ -91,7 +91,7 @@ public final class CommandMap {
     public void invoke(GenshinPlayer player, String rawMessage) {
         rawMessage = rawMessage.trim();
         if(rawMessage.length() == 0) {
-            CommandHandler.sendMessage(player, "No command specified.");
+            CommandHandler.sendMessage(player, "No command specified."); return;
         }
         
         // Remove prefix if present.
@@ -113,7 +113,7 @@ public final class CommandMap {
         if(player != null) {
             String permissionNode = this.annotations.get(label).permission();
             Account account = player.getAccount();
-            if(permissionNode != "" && !account.hasPermission(permissionNode)) {
+            if(!permissionNode.isEmpty() && !account.hasPermission(permissionNode)) {
                 CommandHandler.sendMessage(player, "You do not have permission to run this command."); return;
             }
         }
diff --git a/src/main/java/emu/grasscutter/commands/ServerCommands.java b/src/main/java/emu/grasscutter/commands/ServerCommands.java
index edeac6ca3..8f679581d 100644
--- a/src/main/java/emu/grasscutter/commands/ServerCommands.java
+++ b/src/main/java/emu/grasscutter/commands/ServerCommands.java
@@ -188,6 +188,7 @@ public final class ServerCommands {
                     } else {
                         CommandHandler.sendMessage(null, "Account created with UID " + account.getPlayerId() + ".");
                         account.addPermission("*"); // Grant the player superuser permissions.
+                        account.save(); // Save account to database.
                     }
                     return;
                 case "delete":
diff --git a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
index 0ac4c4fc8..dab6ba0a4 100644
--- a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
+++ b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
@@ -225,8 +225,16 @@ public final class DispatchServer {
 			// Login
 			Account account = DatabaseHelper.getAccountByName(requestData.account);
 			
-			// Test
-			if (account == null) {
+			// Check if account exists, else create a new one.
+			if (account == null && Grasscutter.getConfig().ServerOptions.AutomaticallyCreateAccounts) {
+				// This account has been created AUTOMATICALLY. There will be no permissions added.
+				account = DatabaseHelper.createAccountWithId(requestData.account, 0);
+				
+				responseData.message = "OK";
+				responseData.data.account.uid = account.getId();
+				responseData.data.account.token = account.generateSessionKey();
+				responseData.data.account.email = account.getEmail();
+			} else if (!Grasscutter.getConfig().ServerOptions.AutomaticallyCreateAccounts) {
 				responseData.retcode = -201;
 				responseData.message = "Username not found.";
 			} else {