diff --git a/src/sbbs3/makeuser.c b/src/sbbs3/makeuser.c
index f7d1938b6a638c0868f3ef3b4e5b0274fe0b16bc..bd50c4690db9bdbe9f7a30c87ab762bacb4d2644 100644
--- a/src/sbbs3/makeuser.c
+++ b/src/sbbs3/makeuser.c
@@ -173,6 +173,10 @@ int main(int argc, char **argv)
 
 	for(i=first_arg;i<argc;i++) {
 		if(argv[i][0]=='-') {
+			if(argv[i+1]==NULL) {
+				printf("%s",usage);
+				return(1);
+			}
 			switch(toupper(argv[i++][1])) {
 			case 'A':
 				SAFECOPY(user.address,argv[i]);