diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm
index b33f2d29e67..1f8aeae66bf 100644
--- a/code/datums/wires/robot.dm
+++ b/code/datums/wires/robot.dm
@@ -58,7 +58,7 @@ var/const/BORG_WIRE_CAMERA = 16
 				var/new_ai = select_active_ai()
 				if(new_ai && (new_ai != R.connected_ai))
 					R.connected_ai = new_ai
-					R.connected_ai << "<br><br><span class='notice'>NOTICE - New cyborg connection detected: [R.name].</span><br>"
+					R.connected_ai << "<br><br><span class='notice'>NOTICE - New cyborg connection detected: <b><a href='byond://?src=\ref[R.connected_ai];track2=\ref[R.connected_ai];track=\ref[R]'>[R.name]</a></b></span><br>"
 
 		if (BORG_WIRE_CAMERA)
 			if(!isnull(R.camera) && R.camera.can_use() && !R.scrambledcodes)
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index 7e950271240..3d2e75cec5f 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -51,7 +51,7 @@
 
 /obj/item/borg/upgrade/rename/action(var/mob/living/silicon/robot/R)
 	if(..()) return 0
-	R.connected_ai << "<br><br><span class='notice'>NOTICE - Cyborg connection change detected: [R.name] has been reclassified as [heldname].</span><br>"
+	R.connected_ai << "<br><br><span class='notice'>NOTICE - Cyborg connection change detected: [R.name] has been reclassified as <b><a href='byond://?src=\ref[R.connected_ai];track2=\ref[R.connected_ai];track=\ref[R]'>[heldname]</a></b>.</span><br>"
 	R.name = heldname
 	R.real_name = heldname
 	R.custom_name = heldname //Required or else if the cyborg's module changes, their name is lost.
@@ -76,7 +76,7 @@
 				R.key = ghost.key
 
 	R.stat = CONSCIOUS
-	R.connected_ai << "<br><br><span class='notice'>NOTICE - New cyborg connection detected: [R.name].</span><br>"
+	R.connected_ai << "<br><br><span class='notice'>NOTICE - New cyborg connection detected: <b><a href='byond://?src=\ref[R.connected_ai];track2=\ref[R.connected_ai];track=\ref[R]'>[R.name]</a></b>.</span><br>"
 
 	return 1
 
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index d3ee0598bc3..026d0ad5036 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -86,7 +86,7 @@
 			connected_ai.connected_robots += src
 			lawsync()
 			lawupdate = 1
-			connected_ai << "<br><br><span class='notice'>NOTICE - New cyborg connection detected: [name].</span><br>"
+			connected_ai << "<br><br><span class='notice'>NOTICE - New cyborg connection detected: <b><a href='byond://?src=\ref[connected_ai];track2=\ref[connected_ai];track=\ref[src]'>[name]</a></b></span><br>"
 		else
 			lawupdate = 0