diff --git a/src/sbbs3/logon.cpp b/src/sbbs3/logon.cpp
index b5c8e9e64686817df73542a34c56dbd76d0446dd..a71ab528328b0d56da2c1e5a65d62dbc452c9515 100644
--- a/src/sbbs3/logon.cpp
+++ b/src/sbbs3/logon.cpp
@@ -281,7 +281,7 @@ bool sbbs_t::logon()
 				console|=CON_R_ECHOX;
 				if(!(cfg.sys_misc&SM_ECHO_PW))
 					console|=CON_L_ECHOX;
-				getstr(tmp,LEN_PASS,K_UPPER);
+				getstr(tmp,LEN_PASS*2,K_UPPER);
 				console&=~(CON_R_ECHOX|CON_L_ECHOX);
 				if(strcmp(str,tmp)) {
 					bputs(text[Wrong]);
diff --git a/src/sbbs3/useredit.cpp b/src/sbbs3/useredit.cpp
index 3f78eb5e2013749f176574397303c212f81b97ab..1de3c3ceb006937fefb818cdd4f0e148f62892ae 100644
--- a/src/sbbs3/useredit.cpp
+++ b/src/sbbs3/useredit.cpp
@@ -974,7 +974,7 @@ void sbbs_t::maindflts(user_t* user)
 					console|=CON_R_ECHOX;
 					if(!(cfg.sys_misc&SM_ECHO_PW))
 						console|=CON_L_ECHOX;
-					getstr(tmp,LEN_PASS,K_UPPER);
+					getstr(tmp,LEN_PASS*2,K_UPPER);
 					console&=~(CON_R_ECHOX|CON_L_ECHOX);
 					if(strcmp(str,tmp)) {
 						bputs(text[WrongPassword]);