diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index 8ccbba84845..275d4b7dbf3 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -44,7 +44,7 @@ var/global/normal_ooc_colour = "#002eb8"
 	var/display_colour = normal_ooc_colour
 	if(holder && !holder.fakekey)
 		display_colour = "#0099cc"	//light blue
-		if(holder.rights & R_MOD)
+		if(holder.rights & R_MOD && !(holder.rights & R_ADMIN))
 			display_colour = "#184880"	//dark blue
 		else if(holder.rights & R_ADMIN)
 			if(config.allow_admin_ooccolor)
@@ -55,11 +55,12 @@ var/global/normal_ooc_colour = "#002eb8"
 	for(var/client/C in clients)
 		if(C.prefs.toggles & CHAT_OOC)
 			var/display_name = src.key
-			if(holder.fakekey)
-				if(C.holder)
-					display_name = "[holder.fakekey]/([src.key])"
-				else
-					display_name = holder.fakekey
+			if(holder)
+				if(holder.fakekey)
+					if(C.holder)
+						display_name = "[holder.fakekey]/([src.key])"
+					else
+						display_name = holder.fakekey
 			C << "<font color='[display_colour]'><span class='ooc'><span class='prefix'>OOC:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>"
 
 			/*
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 2a56a4f3def..d6ff60c2a2f 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -72,7 +72,7 @@
 		if(!msg)	return
 
 	var/recieve_color = "purple"
-	var/send_pm_type = ""
+	var/send_pm_type = " "
 	var/recieve_pm_type = "Player"
 
 
@@ -84,7 +84,7 @@
 				recieve_color = "maroon"
 			else
 				recieve_color = "red"
-			send_pm_type = holder.rank
+			send_pm_type = holder.rank + " "
 			recieve_pm_type = holder.rank
 
 	else if(!C.holder)
@@ -111,7 +111,7 @@
 
 	recieve_message = "<font color='[recieve_color]'>[recieve_pm_type] PM from-<b>[key_name(src, C, C.holder ? 1 : 0)]</b>: [msg]</font>"
 	C << recieve_message
-	src << "<font color='blue'>[send_pm_type] PM to-<b>[key_name(C, src, holder ? 1 : 0)]</b>: [msg]</font>"
+	src << "<font color='blue'>[send_pm_type]PM to-<b>[key_name(C, src, holder ? 1 : 0)]</b>: [msg]</font>"
 
 	/*if(holder && !C.holder)
 		C.last_pm_recieved = world.time
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 4597b038e82..7402019ad44 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -196,15 +196,11 @@
 			new_player_panel()
 
 		if(href_list["showpoll"])
-			usr << "\red DB usage has been disabled and that option should not have been available."
-			return
 
 			handle_player_polling()
 			return
 
 		if(href_list["pollid"])
-			usr << "\red DB usage has been disabled and that option should not have been available."
-			return
 
 			var/pollid = href_list["pollid"]
 			if(istext(pollid))