diff --git a/src/server/slave.c b/src/server/slave.c
--- a/src/server/slave.c
+++ b/src/server/slave.c
@@ -29,6 +29,7 @@
 
 // Provides DISTREN_REQUEST* which is in reality, DISTREN_SEND(signal) in the minds of your average joe
 #include "protocol.h"
+#include "options.h" // Confuse, etc.
 #include <string.h>
 
 int slavestatus = 0; // Ugh global vars
@@ -45,7 +46,7 @@ int main(int argc, char *argv[])
 
 		if(argc != 4)
 		{
-			fprintf(stderr, "I need more arguments!\n%d is not enough!\n Invoke 'slave -c <username> <emailaddr> to register'", argc - 1);
+			fprintf(stderr, "I need more arguments!\n%d is not enough!\n Invoke 'slave -c <username> <emailaddr> to register. \n Already registered? Edit your distrend.conf file!'", argc - 1);
 			return 234;
 		}
 
@@ -64,11 +65,31 @@ int main(int argc, char *argv[])
 	}
 /* End arg parser */
 
+char *username;
+char *key;
 
+username = NULL;
+key = NULL;
 
-	if('username and the user\'s key filename are in conf file'){
-		loginuser(username);
+cfg_t * my_cfg;
+cfg_opt_t myopts = {
+		CFG_SIMPLE_STR("username"), &username),
+		CFG_SIMPLE_STR("key"), &key),
+		CFG_END()
+		};
+struct options_common *commonopts
+options_init(argc,argv,&my_cfg, &myopts, "slave", &commonopts);
+
+	if(key == NULL || username == NULL){
+		fprintf(stderr,"You didn't register! Please register or add your username to distrend.conf");
 	}
+	else if(key != NULL || username != NULL){
+		loginuser(username); // Logs in user to the server
+	}
+	else{
+		fprintf(stderr,"Something is terribly wrong!!!");
+	}
+
 
 	if('slave recieves "start frame#, job#"'){
 		fprintf(stderr, "Got frame %d in job %d, preparing to render...",frame,job);