diff --git a/ChangeLog b/ChangeLog
index 6fdd6a8a..444747b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,8 @@ v0.71.3		13-Jun-2005
 
 	mbnewuser:
 		Added logging of remote host and terminal.
+		If the external editor is configured a new user gets the
+		external editor by default instead of the internal editor.
 
 	mball:
 		If a valid WWW logfile is specified in menu 1.13.4 then http
diff --git a/TODO b/TODO
index d484982a..a8263137 100644
--- a/TODO
+++ b/TODO
@@ -35,25 +35,17 @@ libdiesel.a:
 	   processed, instead the previous macro value will be returned.
 
 mbsebbs:
-	X: Better word wrapping or paragraph justification in editor.
-
 	N: OLR, implement file requests.
 
 	N: Only count posted messages in local mail areas.
 
 	L: ChangeHandle, allow own unix name as handle.
 
-	X: OLR: tagged areas must have 3 states, off, on or personal only.
-
-	X: OLR: implement limit date function.
-
 	X: OLR: include private email area in download packets. See also global
            wish for private mail areas.
 
 	X: OLR: implement some global settings from the offline configuration.
 
-	X: OLR: implement keywords and filters.
-
 	X: OLR: check qwke extensions.
 
 	N: OLR: qwk, check netmail entered from reader, fido address missing?
@@ -61,10 +53,6 @@ mbsebbs:
 	N: Translate characterset of messages to the users preferred 
            characterset. This is partly done for testing.
 
-newuser:
-	L: Allow handles to be the same as the unixname. Most menus allow this,
-	   still needed?
-
 mbfido:
 	N: Check all .flo files for dead attachments.
 
diff --git a/mbsebbs/newuser.c b/mbsebbs/newuser.c
index eda21604..bfaea31c 100644
--- a/mbsebbs/newuser.c
+++ b/mbsebbs/newuser.c
@@ -5,7 +5,7 @@
  *			    BBS and unix accounts.
  *
  *****************************************************************************
- * Copyright (C) 1997-2004
+ * Copyright (C) 1997-2005
  *   
  * Michiel Broek		FIDO:		2:280/2802
  * Beekmansbos 10
@@ -102,7 +102,12 @@ int newuser()
     FullName = calloc(81, sizeof(char));
 
     usrconfig.iLanguage = iLang;
-    usrconfig.MsgEditor = FSEDIT;
+
+    /* Set default editor */
+    if (strlen(CFG.externaleditor))
+	exitinfo.MsgEditor = EXTEDIT;
+    else
+	usrconfig.MsgEditor = FSEDIT;
 
     do {