diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index a37e7217af..d67bbfd6c5 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -29,7 +29,7 @@
 	body += "<body>Options panel for <b>[M]</b>"
 	if(M.client)
 		body += " played by <b>[M.client]</b> "
-		body += "\[<A href='?_src_=holder;[HrefToken()];editrights=rank;ckey=[M.ckey]'>[M.client.holder ? M.client.holder.rank : "Player"]</A>\]"
+		body += "\[<A href='?_src_=holder;[HrefToken()];editrights=[(GLOB.admin_datums[M.client.ckey] || GLOB.deadmins[M.client.ckey]) ? "rank" : "add"];ckey=[M.ckey]'>[M.client.holder ? M.client.holder.rank : "Player"]</A>\]"
 		if(CONFIG_GET(flag/use_exp_tracking))
 			body += "\[<A href='?_src_=holder;[HrefToken()];getplaytimewindow=[REF(M)]'>" + M.client.get_exp_living() + "</a>\]"
 
diff --git a/code/modules/admin/permissionedit.dm b/code/modules/admin/permissionedit.dm
index e237a18f6a..c1fcf0ce82 100644
--- a/code/modules/admin/permissionedit.dm
+++ b/code/modules/admin/permissionedit.dm
@@ -165,7 +165,7 @@
 			return
 	switch(task)
 		if("add")
-			admin_ckey = add_admin(null, use_db)
+			admin_ckey = add_admin(admin_ckey, use_db)
 			if(!admin_ckey)
 				return
 			change_admin_rank(admin_ckey, use_db)
