diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 24eddb8b..66fa5997 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -648,20 +648,21 @@
 	if(!check_rights(R_SERVER|R_STEALTH))
 		return
 
-	var/override
+//	var/override
 
-	switch (alert(usr, "Do you want this to only affect the current round, or do you want the server to stay [world.visibility ? "hidden" : "public"] until toggled again?",,"Only affect this round.", "Stay as chosen until toggled again.", "Reset override."))
-		if ("Only affect this round.")
-			override = 0
-		if ("Stay as chosen until toggled again.")
-			override = 1
-		if ("Reset override.")
-			world.save_visibility(world.visibility, 0)
-			message_admins("[src] has reset the hub [world.visibility ? "public" : "hidden"] override")
-			return
+//	switch (alert(usr, "Do you want this to only affect the current round, or do you want the server to stay [world.visibility ? "hidden" : "public"] until toggled again?",,"Only affect this round.", "Stay as chosen until toggled again.", "Reset override."))
+//		if ("Only affect this round.")
+//			override = 0
+//		if ("Stay as chosen until toggled again.")
+//			override = 1
+//		if ("Reset override.")
+//			world.save_visibility(world.visibility, 0)
+///			message_admins("[src] has reset the hub [world.visibility ? "public" : "hidden"] override")
+//			return
 
-	world.visibility = !world.visibility
+	if (alert(usr, "The server is set as [world.visibility ? "public" : "hidden"], do you want to toggle it?",,"Yes","No") == "yes")
+		world.visibility = !world.visibility
 
-	message_admins("[src] has toggled the hub [world.visibility ? "public" : "hidden"]")
-	world.save_visibility(world.visibility, override)
-	return
+		message_admins("[src] has toggled the hub [world.visibility ? "public" : "hidden"]")
+		world.save_visibility(world.visibility)
+		return
diff --git a/code/world.dm b/code/world.dm
index f4db2e53..3ad8fd9e 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -259,17 +259,19 @@ var/master_server_password
 
 /world/proc/load_visibility()
 	var/list/saved_settings = file2list("data/hubsetting.txt")
-	var/list/invisible_days = list("Saturday", "Sunday")
-	if (saved_settings.len == 2)
-		log_misc("Saved visibility is: [saved_settings[1]]; saved override is: [saved_settings[2]].")
-		if (text2num(saved_settings[2]) == 1)
-			world.visibility = text2num(saved_settings[1])
-		else
-			if (time2text(realtime, "Day") in invisible_days)
-				world.visibility = 0
-			else
-				world.visibility = 1
-			save_visibility(world.visibility, 0)
+//	var/list/invisible_days = list("Saturday", "Sunday")
+	log_debug("World loaded with visibility [saved_settings[1]].")
+	world.visibility = text2num(saved_settings[1])
+//	if (saved_settings.len == 2)
+//		log_misc("Saved visibility is: [saved_settings[1]]; saved override is: [saved_settings[2]].")
+//		if (text2num(saved_settings[2]) == 1)
+//			world.visibility = text2num(saved_settings[1])
+//		else
+//			if (time2text(realtime, "Day") in invisible_days)
+//				world.visibility = 0
+//			else
+//				world.visibility = 1
+//			save_visibility(world.visibility, 0)
 
 /world/proc/save_visibility(var/visibility, var/override = 0)
 	var/F = file("data/hubsetting.txt")