diff --git a/src/server/slavefuncs.c b/src/server/slavefuncs.c
--- a/src/server/slavefuncs.c
+++ b/src/server/slavefuncs.c
@@ -92,9 +92,10 @@ int register_user(char *username, char *
 
   /* @TODO: Parse the output buffer or something to check when user creation fails due to duplicate users. This is pretty important. */
 
+
+  conf_replace(username); // puts the person's username in the conf
   ssh_keygen(); // generates keys for login, @TODO: pub key must somehow be sent to the server.
 
-  conf_replace(username); // puts the person's username in the conf
   return 1;
 }