diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 101427d0df1..6c5a68c6dea 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -292,9 +292,6 @@
 /client/proc/send_resources()
 //	preload_vox() //Causes long delays with initial start window and subsequent windows when first logged in.
 
-	// Send NanoUI resources to this client
-	nanomanager.send_resources(src)
-
 	getFiles(
 		'html/search.js',
 		'html/panels.css',
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 34705c2eeea..1c0ba926546 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -56,4 +56,8 @@
 		if(H.species && H.species.abilities)
 			client.verbs |= H.species.abilities
 
-	CallHook("Login", list("client" = src.client, "mob" = src))
+	nanomanager.send_resources(client)
+
+	CallHook("Login", list("client" = src.client, "mob" = src))
+
+
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index 235c4ce7241..076c82b6773 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -29,5 +29,6 @@
 	new_player_panel()
 	spawn(40)
 		if(client)
+			nanomanager.send_resources(client)
 			handle_privacy_poll()
 			client.playtitlemusic()