diff --git a/src/server/slavefuncs.c b/src/server/slavefuncs.c
--- a/src/server/slavefuncs.c
+++ b/src/server/slavefuncs.c
@@ -125,7 +125,11 @@ int register_user(char *username, char *
   if(conf_replace(username) == 0){
 	  fprintf(stderr, "Failed!\n");
   }
-  ssh_keygen(); // generates keys for login, @TODO: pub key must somehow be sent to the server.
+
+  // generates keys for login, @TODO: pub key must somehow be sent to the server.
+  if(ssh_keygen() == 0){
+	  fprintf(stderr, "Failed!\n");
+  }
 
   return 1;
 }
@@ -207,9 +211,11 @@ void conf_replace(char *username){
   fp2 = fopen(fileRepl,"w");
   if (fp1 ==NULL){
 	  fprintf(stderr, "%s doesn't exist\n",fileOrig);
+	  return 0;
   }
   else if(fp2 ==NULL){
 	  fprintf(stderr, "Can't write a file to disk! Check permissions.\n");
+	  return 0;
   }
   else{
     while(fgets(buffer,maxlinelen+2,fp1))
@@ -225,6 +231,7 @@ void conf_replace(char *username){
           fputs(buff_ptr,fp2);
       }
     rename(fileRepl, fileOrig);
+    return 1;
   }
 
   fclose(fp2);