diff --git a/Makefile b/Makefile
index 7725c11..7e215b4 100644
--- a/Makefile
+++ b/Makefile
@@ -27,4 +27,6 @@ $(BUILD_DIR)/%.o: %.cpp
 	$(CC) $(CFLAGS) -c $< -o $@
 
 clean:
-	rm -rf $(BUILD_DIR) twmailer-client twmailer-server
\ No newline at end of file
+	rm -rf $(BUILD_DIR) twmailer-client twmailer-server
+
+.PHONY: all client server clean
\ No newline at end of file
diff --git a/server.cpp b/server.cpp
index f6246f9..e8093fe 100644
--- a/server.cpp
+++ b/server.cpp
@@ -64,13 +64,15 @@ user_handler* user_handler::instancePtr = nullptr;
 int main (int argc, char* argv[])
 {
 	if (argc < 3 ||	
-		!isInteger(argv[1]) ||
-		!fs::is_directory(argv[2])
-		) {
+		!isInteger(argv[1])) {
 		printUsage();
 		return EXIT_FAILURE;
 	}
 
+	if (!fs::is_directory(argv[2])) {
+		fs::create_directory(argv[2]);
+	}
+
 	fs::path spool_dir = fs::path(argv[2]);
 	fs::create_directory(spool_dir/"users");
 	fs::create_directory(spool_dir/"messages");