diff --git a/code/modules/mentor/mentor.dm b/code/modules/mentor/mentor.dm
index fe7a11721f2..27c0f93aefd 100644
--- a/code/modules/mentor/mentor.dm
+++ b/code/modules/mentor/mentor.dm
@@ -31,6 +31,8 @@ var/list/mentor_verbs_default = list(
 		GLOB.mentors -= owner
 		owner.remove_mentor_verbs()
 		owner.mentorholder = null
+		mentor_datums[owner.ckey] = null
+		qdel(src)
 
 /client/proc/add_mentor_verbs()
 	if(mentorholder)
@@ -56,7 +58,7 @@ var/list/mentor_verbs_default = list(
 	if(C.holder)
 		to_chat(src, "<span class='pm warning'>Error: You cannot make an admin a mentor.</span>")
 		return
-	var/datum/mentor/M = new /datum/mentor(C.key)
+	var/datum/mentor/M = new /datum/mentor(C.ckey)
 	M.associate(C)
 	to_chat(C, "<span class='pm notice'>You have been granted mentorship.</span>")
 	to_chat(src, "<span class='pm notice'>You have made [C] a mentor.</span>")
@@ -121,7 +123,9 @@ var/list/mentor_verbs_default = list(
 /client/proc/cmd_dementor()
 	set category = "Admin"
 	set name = "De-mentor"
-	src.mentorholder.disassociate()
+
+	if(tgui_alert(usr, "Confirm self-dementor for the round? You can't re-mentor yourself without someone promoting you.","Dementor",list("Yes","No")) == "Yes")
+		src.mentorholder.disassociate()
 
 /client/proc/cmd_mhelp_reply(whom)
 	if(prefs.muted & MUTE_ADMINHELP)
@@ -204,7 +208,7 @@ var/list/mentor_verbs_default = list(
 	if(!msg)
 		return
 
-	var/interaction_message = "<span class='pm notice'><span class='mentor_channel'>Mentor-PM from-<b>[src]</b> to-<b>[recipient]</b>:</span> [msg]</span>"
+	var/interaction_message = "<span class='pm notice'>Mentor-PM from-<b>[src]</b> to-<b>[recipient]</b>: [msg]</span>"
 
 	if (recipient.current_mentorhelp && !(recipient.mentorholder || recipient.holder))
 		recipient.current_mentorhelp.AddInteraction(interaction_message)
@@ -218,8 +222,8 @@ var/list/mentor_verbs_default = list(
 		if (src.current_mentorhelp)
 			src.current_mentorhelp.AddInteraction(interaction_message)
 
-	to_chat(recipient, "<span class='pm notice'><span class='mentor_channel'>Mentor-PM from-<b><a href='?mentorhelp_msg=\ref[src]'>[src]</a></b>:</span> [msg]</span>")
-	to_chat(src, "<span class='pm notice'><span class='mentor_channel'>Mentor-PM to-<b>[recipient]</b>:</span> [msg]</span>")
+	to_chat(recipient, "<i><span class='mentor'>Mentor-PM from-<b><a href='?mentorhelp_msg=\ref[src]'>[src]</a></b>: [msg]</span></i>")
+	to_chat(src, "<i><span class='mentor'>Mentor-PM to-<b>[recipient]</b>: [msg]</span></i>")
 
 	log_admin("[key_name(src)] sent [msg] to [key_name(recipient)]")
 
diff --git a/code/modules/mentor/mentorhelp.dm b/code/modules/mentor/mentorhelp.dm
index 2dfd049359f..1fd89b1dc16 100644
--- a/code/modules/mentor/mentorhelp.dm
+++ b/code/modules/mentor/mentorhelp.dm
@@ -163,7 +163,7 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new)
 	log_admin("Mentorhelp: [key_name(C)] sent [msg]")
 	MessageNoRecipient(msg)
 	//show it to the person adminhelping too
-	to_chat(C, "<span class='notice'><span class='mentor_channel'>PM to-<b>Mentors</b>:</span> [name]</span>")
+	to_chat(C, "<i><span class='mentor'>PM to-<b>Mentors</b>: [name]</span></i>")
 
 	GLOB.mhelp_tickets.active_tickets += src
 
@@ -197,7 +197,7 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new)
 //message from the initiator without a target, all admins will see this
 /datum/mentor_help/proc/MessageNoRecipient(msg)
 	var/ref_src = "\ref[src]"
-	var/chat_msg = "<span class='notice'><span class='adminhelp'>Ticket [TicketHref("#[id]", ref_src)]</span><b>: [LinkedReplyName(ref_src)]:</b> [msg]</span>"
+	var/chat_msg = "<span class='notice'>Ticket [TicketHref("#[id]", ref_src)]<b>: [LinkedReplyName(ref_src)]:</b> [msg]</span>"
 	AddInteraction("<font color='red'>[LinkedReplyName(ref_src)]: [msg]</font>")
 	for (var/client/C in GLOB.mentors)
 		if (C.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
diff --git a/code/modules/vchat/css/ss13styles.css b/code/modules/vchat/css/ss13styles.css
index 3b1405f5231..9ffa85f3163 100644
--- a/code/modules/vchat/css/ss13styles.css
+++ b/code/modules/vchat/css/ss13styles.css
@@ -90,6 +90,7 @@ body.inverted {
 .pm  .other				{color: #0000ff;}
 
 /* Admin: Channels */
+.mentor				{color: #ff9933;}
 .mentor_channel			{color: #ff9933; font-weight: bold;}
 .mod_channel			{color: #735638; font-weight: bold;}
 .mod_channel .admin		{color: #b82e00; font-weight: bold;}
diff --git a/code/stylesheet.dm b/code/stylesheet.dm
index de6c4dd8a77..7f426a06fb5 100644
--- a/code/stylesheet.dm
+++ b/code/stylesheet.dm
@@ -35,6 +35,7 @@ em						{font-style: normal;font-weight: bold;}
 
 /* Admin: Channels */
 .mentor_channel			{color: #ff9933;	font-weight: bold;}
+.mentor					{color: #ff9933;}
 .mod_channel			{color: #735638;	font-weight: bold;}
 .mod_channel .admin		{color: #b82e00;	font-weight: bold;}
 .admin_channel			{color: #9611D4;	font-weight: bold;}