diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 10592cb16d3..b676da8ffbd 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -61,6 +61,9 @@
 			alert("You cannot perform this action. You must be of a higher administrative rank!")
 			return
 
+	if(href_list["view_player_info"])
+		show_player_info(href_list["view_player_info"])
+
 	if(href_list["add_player_info"])
 		var/key = href_list["add_player_info"]
 		var/add = input("Add Player Info") as null|text
@@ -81,6 +84,14 @@
 
 		del info
 
+		var/savefile/note_list = new("data/player_notes.sav")
+		var/list/note_keys
+		note_list >> note_keys
+		if(!note_keys) note_keys = list()
+		if(!note_keys.Find(key)) note_keys += key
+		note_list << note_keys
+		del note_list
+
 		show_player_info(key)
 
 	if(href_list["remove_player_info"])
@@ -1945,6 +1956,20 @@
 		dat += "</table>"
 		usr << browse(dat, "window=ban;size=400x400")
 
+/obj/admins/proc/PlayerNotes()
+	var/dat = "<B>Player notes</B><HR><table>"
+
+	var/savefile/S=new("data/player_notes.sav")
+	var/list/note_keys
+	S >> note_keys
+	if(!note_keys)
+		dat += "No notes found."
+	else
+		for(var/t in note_keys)
+			dat += text("<tr><td><A href='?src=\ref[src];view_player_info=[t]'>[t]</A></td></tr>")
+	dat += "</table>"
+	usr << browse(dat, "window=player_notes;size=400x400")
+
 /obj/admins/proc/Game()
 
 	var/dat
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index f75c8b07029..addc2eac95f 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -249,6 +249,7 @@
 			verbs += /client/proc/player_panel
 			verbs += /client/proc/unban_panel
 			verbs += /client/proc/jobbans
+			verbs += /client/proc/playernotes
 			verbs += /client/proc/unjobban_panel
 			verbs += /obj/admins/proc/vmode
 			verbs += /obj/admins/proc/votekill
@@ -370,6 +371,7 @@
 	verbs -= /client/proc/player_panel
 	verbs -= /client/proc/unban_panel
 	verbs -= /client/proc/jobbans
+	verbs -= /client/proc/playernotes
 	verbs -= /client/proc/unjobban_panel
 	verbs -= /obj/admins/proc/vmode
 	verbs -= /obj/admins/proc/votekill
@@ -459,6 +461,13 @@
 		holder.Jobbans()
 	return
 
+/client/proc/playernotes()
+	set name = "Display Player Info"
+	set category = "Admin"
+	if(holder)
+		holder.PlayerNotes()
+	return
+
 /client/proc/unban_panel()
 	set name = "Unban Panel"
 	set category = "Admin"