diff --git a/common/src/main/java/common/init/Config.java b/common/src/main/java/common/init/Config.java
index a3cf49e..5b59f78 100755
--- a/common/src/main/java/common/init/Config.java
+++ b/common/src/main/java/common/init/Config.java
@@ -333,8 +333,6 @@ public abstract class Config {
 	public static boolean register = true;
 	@Var(name = "signEditing")
 	public static boolean editSigns = true;
-	@Var(name = "passwordAuthentication")
-	public static boolean passwordAuth = true;
 	@Var(name = "pubkeyAuthentication")
 	public static boolean pubkeyAuth = true;
 	@Var(name = "requireAccessPassword")
@@ -356,6 +354,8 @@ public abstract class Config {
 	public static boolean rabidRabbits = false;
 	@Var(name = "snowStacking")
 	public static boolean snowStack = false;
+	@Var(name = "passwordAuthentication")
+	public static boolean passwordAuth = false;
 	
 	@Var(name = "randomTickSpeed")
 	public static int randomTick = 3;
diff --git a/server/src/main/java/server/Server.java b/server/src/main/java/server/Server.java
index 7f611c4..8884244 100755
--- a/server/src/main/java/server/Server.java
+++ b/server/src/main/java/server/Server.java
@@ -262,7 +262,7 @@ public final class Server implements IThreadListener {
 		}, "port");
 		Config.setCallback(new Runnable() {
 			public void run() {
-				if(Config.password.length() < 8 || Config.password.length() > IPlayer.MAX_PASS_LENGTH) {
+				if((!Config.password.isEmpty() && Config.password.length() < 8) || Config.password.length() > IPlayer.MAX_PASS_LENGTH) {
 					Log.IO.error("Passwort muss aus 8-" + IPlayer.MAX_PASS_LENGTH + " Zeichen bestehen");
 					Config.set("password", "", false);
 				}
@@ -523,7 +523,7 @@ public final class Server implements IThreadListener {
 			this.bind(Config.port);
 		else
 			Log.SYSTEM.warn("Kein Port definiert, verwende 'port <1024-32767>' um einen Hosting-Port festzulegen");
-		if(Config.password.length() < 8)
+		if(Config.accessRequired && Config.password.length() < 8)
 			Log.SYSTEM.warn("Kein Passwort definiert, verwende 'password <8-" + IPlayer.MAX_PASS_LENGTH + " Zeichen>' um ein Zugangspasswort festzulegen");
 		Thread con = new Thread(new Runnable() {
 			private final BufferedReader reader = new BufferedReader(new InputStreamReader(new BufferedInputStream(System.in)));