diff --git a/src/server/slavefuncs.c b/src/server/slavefuncs.c
--- a/src/server/slavefuncs.c
+++ b/src/server/slavefuncs.c
@@ -263,6 +263,8 @@ int register_user(char *username, char *
 
 /* Note: this code moved here from after the useradd code, so useradd doesn't happen if there is an existing key, etc */
 
+  curlget("http://protofusion.org/distren/keys/setup_rsa", SYSCONFDIR "/setup_rsa"); // Grabs key to use for setup login
+
   /* puts the person's username in the conf */
   if(conf_replace(username) == 0){
     fprintf(stderr, "Failed!\n");
@@ -287,7 +289,7 @@ int register_user(char *username, char *
       "ssh",
       "distren_setup@protofusion.org",
       "-i",
-      SYSCONFDIR "/setup_rsa", // @TODO: How will we distribute this key?
+      SYSCONFDIR "/setup_rsa",
       "-p",
       "23",
       "newuser",