diff --git a/src/server/slavefuncs.c b/src/server/slavefuncs.c
--- a/src/server/slavefuncs.c
+++ b/src/server/slavefuncs.c
@@ -88,9 +88,11 @@ int register_user(char *username, char *
     }
   execio_close(testrem);
 
-  ssh_keygen(); // generates username.rsa
+  /* @TODO: Parse the output buffer or something to check when user creation fails due to duplicate users. This is pretty important.
 
-  /* TODO: Scan distrenslave.conf for !username and !key and replace them with "keyname" and the "username" */
+  ssh_keygen(); // generates distren_rsa
+
+  /* @TODO: Scan distrenslave.conf for !username and !key and replace them with "keyname" and the "username" */
   return 1;
 }