diff --git a/exec/load/sbbsdefs.js b/exec/load/sbbsdefs.js
index 5d661a17679a7316c34e52f16e49d9e9e5835bf3..a92fb402af9e7cc6fd3edfc24b5b52cb03f14273 100644
--- a/exec/load/sbbsdefs.js
+++ b/exec/load/sbbsdefs.js
@@ -592,7 +592,8 @@ var LEN_NOTE			=30;	/* User note									*/
 var LEN_COMP			=30;	/* User computer description					*/
 var LEN_COMMENT 		=60;	/* User comment 								*/
 var LEN_NETMAIL 		=60;	/* NetMail forwarding address					*/
-var LEN_PASS			=8;		/* User password								*/
+var LEN_OLDPASS			=8;		/* User password (old/short location)			*/
+var LEN_PASS			=40;	/* User password								*/
 var LEN_PHONE			=12;	/* User phone number							*/
 var LEN_BIRTH			=8;		/* Birthday in MM/DD/YY format					*/
 var LEN_ADDRESS 		=30;	/* User address 								*/
@@ -603,7 +604,6 @@ var LEN_FDESC			=58;	/* File description 							*/
 var LEN_FCDT			=9;		/* 9 digits for file credit values				*/
 var LEN_TITLE			=70;	/* Message title								*/
 var LEN_MAIN_CMD		=34;	/* Storage in user.dat for custom commands		*/
-var LEN_XFER_CMD		=40;
 var LEN_SCAN_CMD		=35;
 var LEN_IPADDR			=45;
 var LEN_CID 			=45;	/* Caller ID (phone number or IP address) 		*/
@@ -626,8 +626,8 @@ var U_NETMAIL		=U_COMMENT+LEN_COMMENT+2;
 var U_ADDRESS		=U_NETMAIL+LEN_NETMAIL+2;
 var U_LOCATION		=U_ADDRESS+LEN_ADDRESS;
 var U_ZIPCODE		=U_LOCATION+LEN_LOCATION;
-var U_PASS			=U_ZIPCODE+LEN_ZIPCODE+2;
-var U_PHONE  		=U_PASS+8;
+var U_OLDPASS		=U_ZIPCODE+LEN_ZIPCODE+2;
+var U_PHONE  		=U_PASS+LEN_OLDPASS;
 var U_BIRTH  		=U_PHONE+12;
 var U_MODEM     	=U_BIRTH+8;
 var U_LASTON		=U_MODEM+8;
@@ -665,8 +665,8 @@ var U_LEECH 		=U_OLDXEDIT+2; 	/* two hex digits - leech attempt count */
 var U_CURSUB		=U_LEECH+2;  	/* Current sub (internal code)  */
 var U_CURXTRN		=U_CURSUB+16; 	/* Current xtrn (internal code) */
 var U_MAIN_CMD		=U_CURXTRN+8+2; /* unused */
-var U_XFER_CMD		=U_MAIN_CMD+LEN_MAIN_CMD; 		/* unused */
-var U_SCAN_CMD		=U_XFER_CMD+LEN_XFER_CMD+2;  	/* unused */
+var U_PASS			=U_MAIN_CMD+LEN_MAIN_CMD; 		/* unused */
+var U_SCAN_CMD		=U_PASS+LEN_PASS+2;  		/* unused */
 var U_IPADDR		=U_SCAN_CMD+LEN_SCAN_CMD; 		/* unused */
 var U_FREECDT		=U_IPADDR+LEN_IPADDR+2;
 var U_FLAGS3		=U_FREECDT+10; 	/* Flag set #3 */