diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 4727f167ef..6a2a0d3801 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -144,9 +144,9 @@
 		totalPlayersReady = 0
 		var/datum/job/refJob = null
 		for(var/mob/new_player/player in player_list)
-			refJob = player.client.prefs.get_highest_job()
-			var/obfuscate_key = player.client.prefs.read_preference(/datum/preference/toggle/obfuscate_key)
-			var/obfuscate_job = player.client.prefs.read_preference(/datum/preference/toggle/obfuscate_job)
+			refJob = player.client?.prefs.get_highest_job()
+			var/obfuscate_key = player.read_preference(/datum/preference/toggle/obfuscate_key)
+			var/obfuscate_job = player.read_preference(/datum/preference/toggle/obfuscate_job)
 			if(obfuscate_key && obfuscate_job)
 				. += "Anonymous User [player.ready ? "Ready!" : null]"
 			else if(obfuscate_key)
diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm
index 7d1c8ecd7f..1fa12e3cbe 100644
--- a/code/modules/tgui/tgui.dm
+++ b/code/modules/tgui/tgui.dm
@@ -264,7 +264,7 @@
 		"status" = status,
 		"interface" = list(
 			"name" = interface,
-			"layout" = null, // user.client.prefs.read_preference(/datum/preference/choiced/tgui_layout), // unused
+			"layout" = null, // user.read_preference(/datum/preference/choiced/tgui_layout), // unused
 		),
 		//"refreshing" = refreshing,
 		"refreshing" = FALSE,
@@ -275,7 +275,7 @@
 			"size" = window_size,
 			"fancy" = user.read_preference(/datum/preference/toggle/tgui_fancy),
 			"locked" = user.read_preference(/datum/preference/toggle/tgui_lock),
-			"scale" = user.client.prefs.read_preference(/datum/preference/toggle/ui_scale),
+			"scale" = user.read_preference(/datum/preference/toggle/ui_scale),
 		),
 		"client" = list(
 			"ckey" = user.client.ckey,