diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index ee5133390..a313a9b5c 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -132,12 +132,18 @@ bool Servatrice::initServer()
 {
 	serverName = settings->value("server/name").toString();
 	serverId = settings->value("server/id", 0).toInt();
-	
+	regServerOnly = settings->value("server/regonly", 0).toBool();
+		
 	const QString authenticationMethodStr = settings->value("authentication/method").toString();
-	if (authenticationMethodStr == "sql")
+	if (authenticationMethodStr == "sql") {
 		authenticationMethod = AuthenticationSql;
-	else
+	} else {
+		if (regServerOnly) {
+			qDebug() << "Registration only server enabled but no DB Connection : Error.";
+			return false;	
+		}
 		authenticationMethod = AuthenticationNone;
+	}
 	
 	QString dbTypeStr = settings->value("database/type").toString();
 	if (dbTypeStr == "mysql")