diff --git a/src/server/slavefuncs.c b/src/server/slavefuncs.c
--- a/src/server/slavefuncs.c
+++ b/src/server/slavefuncs.c
@@ -22,6 +22,8 @@
   * distrenslave -c username email@example.com
  */
 #include <stdio.h>
+#include <string.h>
+
 
 void ssh_keygen(){
 	// Give me some args!
@@ -77,12 +79,13 @@ void registeruser(char *username, char *
 
 void loginuser(char *username){
   // Logs into sandboxed user on zserver2 as a client, currently does nothing
+  char *userhost = strcat(username, "@protofusion.org"); // Throws @protofusion.org after the username
   char buf[10];
   struct execio *testrem;
   char *execargv[] =
     {
   "ssh",
-  "username@protofusion.org", // username must be read from the conf
+  userhost, // username and hostname
   "-i",
   "username.rsa", // Key created from registeruser()
   "-p",
@@ -105,7 +108,8 @@ void loginuser(char *username){
   execio_close(testrem);
 }
 
-/* Replaces username and key in the slave's conf file, currently pseudo */
+/* Replaces username and key in the slave's conf file, currently pseudo, add to .h!!! */
+/*
 void conf_replace(char *username, char *key){
 	// Doesn't delete anything! :D
 	mktemp(); // Gets a new file to put data into
@@ -116,12 +120,14 @@ void conf_replace(char *username, char *
 	fsync(); // fsync the file we wrote data to
 	rename(); // rename the old file to the new file
 }
+*/
 
 /* Executors */
 
 /*
   It seems that the client will need to know the job number. Is finish_frame going to be on the client or the server? we gotta figure that out!
 */
+
 void exec_blender(struct blendjob* blendjob, char *input, char *output, int frame)
 {
   char *frame_str;