diff --git a/src/sbbs3/logon.cpp b/src/sbbs3/logon.cpp
index cb55c1f57e1a8683e2b6710afbbf8269a2a60eeb..33c1f4cba2aa4309b92d5edb214a76342e914bd8 100644
--- a/src/sbbs3/logon.cpp
+++ b/src/sbbs3/logon.cpp
@@ -232,7 +232,7 @@ bool sbbs_t::logon()
 			bprintf(text[TimeToChangePw],cfg.sys_pwdays);
 
 			c=0;
-			while(c<LEN_PASS) { 				/* Create random password */
+			while(c < RAND_PASS_LEN) { 				/* Create random password */
 				str[c]=sbbs_random(43)+'0';
 				if(isalnum(str[c]))
 					c++; 
@@ -261,7 +261,7 @@ bool sbbs_t::logon()
 				getstr(tmp,LEN_PASS*2,K_UPPER);
 				console&=~(CON_R_ECHOX|CON_L_ECHOX);
 				if(strcmp(str,tmp)) {
-					bputs(text[Wrong]);
+					bputs(text[Wrong]); // Should be WrongPassword instead?
 					continue; 
 				}
 				break; 
diff --git a/src/sbbs3/newuser.cpp b/src/sbbs3/newuser.cpp
index 0dd1f740565ca5f426f4f5c4a37de30d5da7e73d..17c8fd40c910b2007e3aa6fd88a5ca2e61ad5d00 100644
--- a/src/sbbs3/newuser.cpp
+++ b/src/sbbs3/newuser.cpp
@@ -367,7 +367,7 @@ BOOL sbbs_t::newuser()
 	}
 	else {
 		c=0;
-		while(c<LEN_PASS) { 				/* Create random password */
+		while(c < RAND_PASS_LEN) { 				/* Create random password */
 			useron.pass[c]=sbbs_random(43)+'0';
 			if(isalnum(useron.pass[c]))
 				c++; 
diff --git a/src/sbbs3/sbbsdefs.h b/src/sbbs3/sbbsdefs.h
index 8b892775766eaf6f9bfdfc405e73315fa584e01e..5aaa321ca576310a5cf5fd6bc64b62de3593ed7e 100644
--- a/src/sbbs3/sbbsdefs.h
+++ b/src/sbbs3/sbbsdefs.h
@@ -528,6 +528,7 @@ typedef enum {						/* Values for xtrn_t.event				*/
 #define LEN_MAIN_CMD	34	/* Storage in user.dat for custom commands		*/
 #define LEN_PASS		40
 #define MIN_PASS_LEN	 4
+#define RAND_PASS_LEN	 8
 #define LEN_SCAN_CMD	35
 #define LEN_IPADDR		45
 #define LEN_CID 		45	/* Caller ID (phone number) 					*/