diff --git a/exec/badpasswords.js b/exec/badpasswords.js
index 2b796c6ea2bec320cb44c03803dccc0d41e1cf02..4b895a784f4df2ef4925667af55c7ca1a1398912 100644
--- a/exec/badpasswords.js
+++ b/exec/badpasswords.js
@@ -1,10 +1,15 @@
-load("sbbsdefs.js");
+// $Id$
+
+"use strict";
+require("sbbsdefs.js", 'USER_DELETED');
+
 var badpasswords=0;
-usr = new User(1);
-for(u=1; u<=system.lastuser; u++) {
-	usr.number=u;
-	if(usr==null)
-		break;
+var usr = new User;
+var lastuser = system.lastuser;
+for(var u=1; u <= lastuser; u++) {
+	usr.number = u;
+	if(usr == null)
+		continue;
 	if(usr.settings&(USER_DELETED|USER_INACTIVE))
 	    continue;
 	if(!system.trashcan("password",usr.security.password))
diff --git a/exec/userlist.js b/exec/userlist.js
index 15de69464a0451e71e2ac6a3f2dc3c3557c7e6f5..94810684ca781d96d829f61f8367c2a0df409d6c 100644
--- a/exec/userlist.js
+++ b/exec/userlist.js
@@ -4,16 +4,15 @@
 
 // $Id$
 
-load("sbbsdefs.js");
+"use strict";
 
-if(system.lastuser==undefined)	/* v3.10 */
-	lastuser=system.stats.total_users;
-else							/* v3.11 */
-	lastuser=system.lastuser;
-var u = new User(1);
+require("sbbsdefs.js", 'USER_DELETED');
 
-for(i=1;i<=lastuser;i++) {
-	u.number=i;
+var lastuser = system.lastuser;
+var u = new User;
+
+for(var i = 1; i <= lastuser; i++) {
+	u.number = i;
 	if(u.settings&USER_DELETED)
 		continue;
 	printf("%d/%d ",i,lastuser);
@@ -22,6 +21,6 @@ for(i=1;i<=lastuser;i++) {
 		,u.location
 		,u.connection
 		);
-	if(this.bbs!=undefined && bbs.sys_status&SS_ABORT)
+	if(js.global.console != undefined && console.aborted == true)
 		break;
-}	
\ No newline at end of file
+}
\ No newline at end of file