diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 46c3dc12d24..40af83e0f9b 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -110,9 +110,10 @@
 
 		//Admin Observer
 		if (holder.level >= -1)
+			seeprayers = 1
+
 			verbs += /client/proc/cmd_admin_say
 			verbs += /client/proc/deadmin_self
-			verbs += /client/proc/admin_ghost
 			verbs += /client/proc/toggleadminhelpsound
 		else	return
 
@@ -131,6 +132,7 @@
 			verbs += /client/proc/cmd_admin_pm_panel
 			verbs += /client/proc/cmd_admin_subtle_message
 			verbs += /client/proc/dsay
+			verbs += /client/proc/admin_ghost
 			verbs += /client/proc/game_panel
 			verbs += /client/proc/player_panel
 			verbs += /client/proc/player_panel_new
@@ -169,7 +171,6 @@
 		//Trial Admin
 		if (holder.level >= 3)
 			deadchat = 1
-			seeprayers = 1
 
 			verbs += /client/proc/invisimin
 			verbs += /datum/admins/proc/view_txt_log
diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm
index 3b96ba378e1..6ab7a1021cf 100644
--- a/code/modules/admin/holder2.dm
+++ b/code/modules/admin/holder2.dm
@@ -43,6 +43,10 @@ var/list/admin_datums = list()
 		log_admin("[key_name(usr)] tried to use the admin panel without authorization.")
 		return
 
+	if (!(usr.client.holder.rank in list("Moderator", "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master")))
+		usr << "\red You cannot perform this action. You must be of a higher administrative rank!"
+		return
+
 	if(href_list["makeAntag"])
 		switch(href_list["makeAntag"])
 			if("1")