diff --git a/code/modules/mob/login_vr.dm b/code/modules/mob/login_vr.dm
index a9ce4bd51d4..ac2344d5c6f 100644
--- a/code/modules/mob/login_vr.dm
+++ b/code/modules/mob/login_vr.dm
@@ -4,3 +4,6 @@
 	if(viewing_alternate_appearances && viewing_alternate_appearances.len)
 		for(var/datum/alternate_appearance/AA in viewing_alternate_appearances)
 			AA.display_to(list(src))
+
+	var/obj/screen/plane_master/augmented/aug = plane_holder.plane_masters[VIS_AUGMENTED]
+	aug.apply()
diff --git a/code/modules/mob/mob_planes_vr.dm b/code/modules/mob/mob_planes_vr.dm
index 2ea9d49cc4b..5d41209b196 100644
--- a/code/modules/mob/mob_planes_vr.dm
+++ b/code/modules/mob/mob_planes_vr.dm
@@ -5,7 +5,7 @@
 	plane_masters[VIS_CH_BACKUP] 		= new /obj/screen/plane_master{plane = PLANE_CH_BACKUP}				//Backup implant status
 	plane_masters[VIS_CH_VANTAG] 		= new /obj/screen/plane_master{plane = PLANE_CH_VANTAG}				//Vore Antags
 
-	plane_masters[VIS_AUGMENTED]		= new /obj/screen/plane_master/augmented(null,my_mob)				//Augmented reality
+	plane_masters[VIS_AUGMENTED]		= new /obj/screen/plane_master/augmented(my_mob)					//Augmented reality
 
 /////////////////
 //AR planemaster does some special image handling
@@ -14,13 +14,11 @@
 	var/state = FALSE //Saves cost with the lists
 	var/mob/my_mob
 
-/obj/screen/plane_master/augmented/New(var/newloc, var/mob/M)
-	..(newloc)
+/obj/screen/plane_master/augmented/New(var/mob/M)
+	..()
 	my_mob = M
-	logged_in_event.register(my_mob,src,/obj/screen/plane_master/augmented/proc/apply)
 
 /obj/screen/plane_master/augmented/Destroy()
-	logged_in_event.unregister(my_mob,src)
 	my_mob = null
 	return ..()
 
diff --git a/code/modules/nifsoft/software/14_commlink.dm b/code/modules/nifsoft/software/14_commlink.dm
index f6a1f567cdd..158846ebcc4 100644
--- a/code/modules/nifsoft/software/14_commlink.dm
+++ b/code/modules/nifsoft/software/14_commlink.dm
@@ -13,6 +13,10 @@
 		if((. = ..()))
 			nif.comm = new(nif,src)
 
+	uninstall()
+		if((. = ..()))
+			qdel_null(nif.comm)
+
 	activate()
 		if((. = ..()))
 			nif.comm.initialize_exonet(nif.human)