diff --git a/main.c b/main.c
index a8312fe..0441549 100644
--- a/main.c
+++ b/main.c
@@ -128,15 +128,26 @@ User** create_user_list(char* filename) {
 	int num_users = num_of_lines(filename);
         char* file_str = file_to_string(filename);
 
-        char* token = malloc(sizeof(char) * 30);
-        User** users = malloc (num_users * sizeof(User*));
+        char* token = malloc(30 * sizeof(char));
+        User** users = malloc(num_users * sizeof(User*));
 
-        token = strtok(file_str," \r\n");
-        for (int i=0;i<num_users;i++) {
-		(*(users + i))->username = strdup(token);
-                token = strtok(NULL," \r\n");
-                (*(users + i))->password = strdup(token);
-                token = strtok(NULL," \r\n");
+        token = strtok(file_str," \n");
+
+	for (int i=0;i<num_users;i++) {
+		(*(users + i)) = malloc(sizeof(User));
+	}
+
+
+	for (int i=0;i<num_users;i++) {
+		(*(users + i))->username = malloc(strlen(token)+1);
+		strcpy((*(users + i))->username,token);
+
+                token = strtok(NULL," \n");
+
+       		(*(users + i))->password = malloc(strlen(token)+1);
+		strcpy((*(users + i))->password,token);
+
+                token = strtok(NULL," \n");
         }
 
 	return users;