diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index b8d8a1879..072872469 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -277,7 +277,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 /datum/preferences/New(client/C)
 	parent = C
-	clientfps = world.fps*2
 	for(var/custom_name_id in GLOB.preferences_custom_names)
 		custom_names[custom_name_id] = get_default_name(custom_name_id)
 
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 0d37b98c1..3fc7e3c11 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -57,7 +57,9 @@
 				var/datum/callback/CB = foo
 				CB.Invoke()
 
-	mind?.hide_ckey = client?.prefs?.hide_ckey
+		if(client.prefs)
+			mind?.hide_ckey = client.prefs.hide_ckey
+			client.fps = client.prefs.clientfps
 	log_message("Client [key_name(src)] has taken ownership of mob [src]([src.type])", LOG_OWNERSHIP)
 	SEND_SIGNAL(src, COMSIG_MOB_CLIENT_LOGIN, client)
 	client.init_verbs()