diff --git a/world/net/include/net.h b/world/net/include/net.h
index 0c7fa5d..6f731c1 100644
--- a/world/net/include/net.h
+++ b/world/net/include/net.h
@@ -138,8 +138,13 @@
 # define	NO_NEWBIES
 #endif
 
+#ifdef REGISTERED_USERS_ONLY
+# echo Please fix your #define REGISTERED_USERS_ONLY
+# define _flag_disable_unauthenticated_users
+#endif
+
 #ifdef RELAY
-# define	NO_NEWBIES	// same as REGISTERED_USERS_ONLY ?
+# define	NO_NEWBIES	// same as _flag_disable_unauthenticated_users ?
 				// anyway, chance for some ifdef optimizations TODO
 # define	IRCGATE_NICK		"PSYC.EU"
 # undef		DEFAULT_USER_OBJECT
diff --git a/world/net/jabber/disco.c b/world/net/jabber/disco.c
index 757e42f..c6363cb 100644
--- a/world/net/jabber/disco.c
+++ b/world/net/jabber/disco.c
@@ -18,7 +18,7 @@
 disco_info_root(vars) {
     string featurelist;
     featurelist = "<feature var='http://jabber.org/protocol/muc'/>"
-#ifndef REGISTERED_USERS_ONLY
+#ifndef _flag_disable_unauthenticated_users
 # ifndef _flag_disable_registration
 #  ifndef _flag_disable_registration_XMPP
 		"<feature var='jabber:iq:register'/>"
diff --git a/world/net/jabber/server.c b/world/net/jabber/server.c
index db1d43c..a313651 100644
--- a/world/net/jabber/server.c
+++ b/world/net/jabber/server.c
@@ -187,7 +187,7 @@ jabberMsg(XMLNode node) {
 	    case "jabber:iq:register":
 		if (node["@type"] == "get"){
 		    string packet;
-#if defined(REGISTERED_USERS_ONLY) || defined(_flag_disable_registration) || defined(_flag_disable_registration_XMPP)
+#if defined(_flag_disable_unauthenticated_users) || defined(_flag_disable_registration) || defined(_flag_disable_registration_XMPP)
 		    // super dirty.. this should all be in textdb
 		    packet = sprintf("<iq type='result' id='%s'>"
 				     "<query xmlns='jabber:iq:register'/>"
@@ -234,7 +234,7 @@ jabberMsg(XMLNode node) {
 			emit(packet);
 			// QUIT
 		    } else {
-#if defined(REGISTERED_USERS_ONLY) || defined(_flag_disable_registration) || defined(_flag_disable_registration_XMPP)
+#if defined(_flag_disable_unauthenticated_users) || defined(_flag_disable_registration) || defined(_flag_disable_registration_XMPP)
 			// TODO: generate some error as above
 #else
 			user -> vSet("password", t[Cdata]);
@@ -358,7 +358,7 @@ jabberMsg(XMLNode node) {
 # endif
 		break;
 #endif
-#ifndef REGISTERED_USERS_ONLY
+#ifndef _flag_disable_unauthenticated_users
 	    case "ANONYMOUS":
 		unless(node[Cdata]) {
 		    SASL_ERROR("incorrect-encoding")
@@ -481,7 +481,7 @@ open_stream(XMLNode node) {
 		      "<mechanism>DIGEST-MD5</mechanism>"
 #endif
 		      "<mechanism>PLAIN</mechanism>";
-#ifndef REGISTERED_USERS_ONLY
+#ifndef _flag_disable_unauthenticated_users
 		    // sasl anonymous
 		      "<mechanism>ANONYMOUS</mechanism>";
 #endif
@@ -494,7 +494,7 @@ open_stream(XMLNode node) {
 #endif
 		features += "</mechanisms>";
 		features += "<auth xmlns='http://jabber.org/features/iq-auth'/>";
-#ifndef REGISTERED_USERS_ONLY
+#ifndef _flag_disable_unauthenticated_users
 		features += "<register xmlns='http://jabber.org/features/iq-register'/>";
 #endif
 	    }
diff --git a/world/net/jabber/user.c b/world/net/jabber/user.c
index 2d70d71..4f43422 100644
--- a/world/net/jabber/user.c
+++ b/world/net/jabber/user.c
@@ -626,7 +626,7 @@ iq(XMLNode node) {
 	    break;
 	}
 	break;
-#if !defined(REGISTERED_USERS_ONLY) && !defined(_flag_disable_registration) && !defined(_flag_disable_registration_XMPP)
+#if !defined(_flag_disable_unauthenticated_users) && !defined(_flag_disable_registration) && !defined(_flag_disable_registration_XMPP)
     case "jabber:iq:register":
 	switch(node["@type"]) {
 	case "get":
diff --git a/world/net/person.c b/world/net/person.c
index a2ce76c..bf6af3a 100644
--- a/world/net/person.c
+++ b/world/net/person.c
@@ -756,7 +756,7 @@ checkPassword(try, method, salt, args, cb, varargs cbargs) {
 #endif
 	// why here?
 	//while (remove_call_out(#'quit) != -1);
-#ifndef REGISTERED_USERS_ONLY
+#ifndef _flag_disable_unauthenticated_users
 # ifdef AUTH_HMAC_SECRET
         if (IS_NEWBIE && method != "hmac-sha1-shared") ARETURN(1)
 # else
diff --git a/world/net/root.c b/world/net/root.c
index 585c0e0..51a0b93 100644
--- a/world/net/root.c
+++ b/world/net/root.c
@@ -55,7 +55,7 @@ msg(source, mc, data, vars, showingLog, target) {
 				       	"version",    // _tab
 					"time", "lasttime"
 #endif
-#if !defined(REGISTERED_USERS_ONLY) && !defined(_flag_disable_registration) &&!defined(_flag_disable_registration_XMPP)
+#if !defined(_flag_disable_unauthenticated_users) && !defined(_flag_disable_registration) &&!defined(_flag_disable_registration_XMPP)
 					"registration",
 #endif
 #ifndef VOLATILE
diff --git a/world/net/server.c b/world/net/server.c
index 324bb11..80f0e29 100644
--- a/world/net/server.c
+++ b/world/net/server.c
@@ -81,7 +81,7 @@ hello(ni, elm, try, method, salt) {
 				     ni, try, elm);
 }
 
-#ifdef REGISTERED_USERS_ONLY	// TODO: rename into a _flag
+#ifdef _flag_disable_unauthenticated_users
 ohYeah(whatever) {
 	input_to(#'ohYeah, input_to_settings);
 	// input ignore warning? inverting mc's is really a good idea!
@@ -120,7 +120,7 @@ authChecked(int result, ni, try, elm) {
 //			    return;
 //		    }
 		}
-#ifdef REGISTERED_USERS_ONLY
+#ifdef _flag_disable_unauthenticated_users
 		else {
 			if (user -> isNewbie()) {
 #ifdef PSYC_SYNCHRONIZE
@@ -157,7 +157,7 @@ authChecked(int result, ni, try, elm) {
 		return promptForPassword(user);
 #endif
 	}
-#ifndef REGISTERED_USERS_ONLY
+#ifndef _flag_disable_unauthenticated_users
 	// added user->isNewbie() check for ircers
 	if (user->online() && user->isNewbie()
 #ifdef _flag_log_hosts