diff --git a/frames_list.js b/frames_list.js
index 70c6cbe..0573b8c 100644
--- a/frames_list.js
+++ b/frames_list.js
@@ -1,6 +1,6 @@
 load('load/string.js');
 load('load/funcs.js');
-load('ansitex/load/msgbases.js');
+
 
 if (argv.length !== 1) {
 	writeln('ERROR: Need a msgbase page prefix');
@@ -11,6 +11,8 @@ ma = new MsgAreas();
 area = ma.getArea(argv[0]);
 
 writeln('Opening ['+argv[0]+'] - ('+area.msgbase.cfg.code+')');
+writeln('- First:'+area.msgbase.first_msg);
+writeln('- Last:'+area.msgbase.last_msg);
 
 for (var x in area.headers) {
 	writeln(padright(area.headers[x].number,4,' ')+':'+area.headers[x].tags);
diff --git a/main.js b/main.js
index 77ae19a..9347bbd 100644
--- a/main.js
+++ b/main.js
@@ -22,6 +22,7 @@ require('ansitex/load/frame-viewdata.js','FRAME_VIEWDATA');
 
 // @todo Returning from chat should refresh the frame
 // @todo Suppress displays of telegrams
+bbs.node_settings &= ~(NM_LOGON_P); // Dont always ask for a password.
 
 /**
  * This is our main event loop - we where interact with the user.
@@ -186,6 +187,7 @@ while(bbs.online) {
 						if (time() > timer+((user.number ? INACTIVE_LOGIN : INACTIVE_NOLOGIN)+INKEY_TIMEOUT)/1000) {
 							fo.sendBaseline('INACTIVE',false);
 							action = ACTION_TERMINATE;
+							mode = false;
 							log(LOG_INFO,'User INACTIVE - terminating...');
 
 						// Idle warning - due to inactivity.
@@ -634,16 +636,16 @@ while(bbs.online) {
 								mode = MODE_RFSENT;
 
 							} else {
-								log(LOG_DEBUG,'  - Key 1 is a METHOD check it exists:'+JSON.stringify(fo.key[1]));
+								log(LOG_DEBUG,'  - Key 1 is a METHOD check it exists: '+JSON.stringify(fo.key[1]));
 
 								switch(fo.key[1]) {
 									// User is logging in to system or CUG
 									case 'login':
-										log(LOG_DEBUG,'  - User:'+JSON.stringify(fo.frame_fields[0].fvalue));
+										log(LOG_DEBUG,'  - User: '+fo.frame_fields[0].fvalue+'/'+fo.frame_fields[1].fvalue);
 
 										// If login is successful, we'll exit here
-										if (bbs.login(fo.frame_fields[0].fvalue,null,fo.frame_fields[1].fvalue)) {
-											log(LOG_DEBUG,'  - User:'+JSON.stringify(user.number));
+										if (bbs.login(fo.frame_fields[0].fvalue,'',fo.frame_fields[1].fvalue)) {
+											log(LOG_DEBUG,'  - User: '+JSON.stringify(user.number));
 											bbs.logon();
 											log(LOG_DEBUG,'  - SEND TO EXIT:');