diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 8ce617b4ca..c3f38918ae 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -443,7 +443,7 @@
 		//ghostize
 		var/mob/body = mob
 		body.ghostize(1)
-		body.key = "@[key]"			//Haaaaaaaack. But the people have spoken. If it breaks; blame adminbus
+		if(body)	body.key = "@[key]"			//Haaaaaaaack. But the people have spoken. If it breaks; blame adminbus
 		feedback_add_details("admin_verb","O") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 
diff --git a/html/changelog.html b/html/changelog.html
index f6bd17cd6f..d15dbe79ca 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -52,6 +52,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	<h2 class="date">17 September 2012</h2>
 	<h3 class="author">Carn updated:</h3>
 	<ul class="changes bgimages16">
+		<li class="rscadd">F5 is now a hotkey for adminghosting (for admins obviously)</li>
 		<li class="tweak">Catatonia makes you fall down. Admins appear braindead when admin-ghosting.</li>
 		<li class="tweak">"Set-observe"/"Set-play" renamed and merged into "Aghost".</li>
 		<li class="tweak">"Lay down/Get up" renamed to "Rest"</li>
diff --git a/interface/interface.dm b/interface/interface.dm
index 9f71759665..b5d93bc3af 100644
--- a/interface/interface.dm
+++ b/interface/interface.dm
@@ -119,7 +119,7 @@ Any-Mode: (hotkey doesn't need to be on)
 
 	var/admin = {"<font color='purple'>
 Admin:
-\tF5 = toggle-admin-observe (WIP)
+\tF5 = Aghost (admin-ghost)
 \tF6 = player-panel-new
 \tF7 = admin-pm
 \tF8 = (WIP)
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 78ee034c6d..47133c54e5 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -121,7 +121,7 @@ macro "macro"
 		is-disabled = false
 	elem 
 		name = "F5"
-		command = "admin-observe"
+		command = "Aghost"
 		is-disabled = false
 	elem 
 		name = "F6"
@@ -303,7 +303,7 @@ macro "hotkeymode"
 		is-disabled = false
 	elem 
 		name = "F5"
-		command = "admin-observe"
+		command = "Aghost"
 		is-disabled = false
 	elem 
 		name = "F6"