diff --git a/code/defines/global.dm b/code/defines/global.dm
index d3a29ab23e8..9a7286f26ef 100644
--- a/code/defines/global.dm
+++ b/code/defines/global.dm
@@ -65,7 +65,7 @@ var
 	dna_ident = 1
 	abandon_allowed = 1
 	enter_allowed = 1
-	guests_allowed = 1
+//	guests_allowed = 1
 	shuttle_frozen = 0
 	shuttle_left = 0
 	tinted_weldhelh = 1
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index b676da8ffbd..25cbee548b8 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -2588,6 +2588,7 @@
 	log_admin("[key_name(usr)] toggled tinted_weldhelh.")
 	message_admins("[key_name_admin(usr)] toggled tinted_weldhelh.", 1)
 
+/*
 /obj/admins/proc/toggleguests()
 	set category = "Server"
 	set desc="Guests can't enter"
@@ -2599,6 +2600,7 @@
 		world << "<B>Guests may now enter the game.</B>"
 	log_admin("[key_name(usr)] toggled guests game entering [guests_allowed?"":"dis"]allowed.")
 	message_admins("\blue [key_name_admin(usr)] toggled guests game entering [guests_allowed?"":"dis"]allowed.", 1)
+*/
 
 
 
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 44d942eac54..8bc39c6f678 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -231,7 +231,7 @@
 		if (holder.level >= 0)//Mod********************************************************************
 			verbs += /obj/admins/proc/toggleAI				//Toggle the AI
 			verbs += /obj/admins/proc/toggleenter			//Toggle enterting
-			verbs += /obj/admins/proc/toggleguests			//Toggle guests entering
+//			verbs += /obj/admins/proc/toggleguests			//Toggle guests entering
 			verbs += /obj/admins/proc/toggleooc				//toggle ooc
 			verbs += /obj/admins/proc/toggleoocdead         //toggle ooc for dead/unc
 			verbs += /obj/admins/proc/voteres 				//toggle votes
@@ -352,7 +352,7 @@
 	verbs -= /client/proc/cmd_admin_create_centcom_report
 	verbs -= /obj/admins/proc/toggleAI				//Toggle the AI
 	verbs -= /obj/admins/proc/toggleenter			//Toggle enterting
-	verbs -= /obj/admins/proc/toggleguests			//Toggle guests entering
+//	verbs -= /obj/admins/proc/toggleguests			//Toggle guests entering
 	verbs -= /obj/admins/proc/toggleooc				//toggle ooc
 	verbs -= /obj/admins/proc/toggleoocdead         //toggle ooc for dead/unc
 	verbs -= /obj/admins/proc/voteres 				//toggle votes
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index fc6d8a61adb..fa41cdc8bb5 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -700,11 +700,17 @@
 		alert(src,"You have been banned.\nReason : [isbanned]","Ban","Ok")
 		del(src)
 
+/*
 	if (!guests_allowed && IsGuestKey(key))
 		log_access("Failed Login: [src] - Guests not allowed")
 		message_admins("\blue Failed Login: [src] - Guests not allowed")
 		alert(src,"You cannot play here.\nReason : Guests not allowed","Guests not allowed","Ok")
 		del(src)
+*/
+
+	if(IsGuestKey(src.key))
+		alert(src,"Baystation12 doesn't allow guest accounts to play. Please go to http://www.byond.com/ and register for a key.","Guest","OK")
+		del(src)
 
 	if (((world.address == address || !(address)) && !(host)))
 		host = key