diff --git a/ChangeLog b/ChangeLog
index dc3061a6..91bfbe81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,14 @@ v0.61.3		25-Jul-2004
 	mbfile:
 		Fixed a bug where "mbfile k p i" didn't give the help screen.
 
+	mbnewuser:
+		Made questions for screenlen, newmail check and newfiles check
+		dependant of settings in the setup.
+
+	mbtask:
+		Added defaults for questions for screenlen, newmail chack and
+		newfiles check.
+
 	examples:
 		Fixed 2 spelling errors in the dutch macro templates.
 
diff --git a/mbsebbs/newuser.c b/mbsebbs/newuser.c
index 8d7f5025..bd3bfb7b 100644
--- a/mbsebbs/newuser.c
+++ b/mbsebbs/newuser.c
@@ -474,8 +474,8 @@ int newuser()
     sprintf(usrconfig.sProtocol, "%s", (char *) Language(65));
     usrconfig.DoNotDisturb = FALSE;
 
-    switch (CFG.Newmail) {
-	case NO:    usrconfig.Mailscan = FALSE;
+    switch (CFG.AskNewmail) {
+	case NO:    usrconfig.MailScan = FALSE;
 		    break;
 	case YES:   usrconfig.MailScan = TRUE;
 		    break;
@@ -501,7 +501,7 @@ int newuser()
 		    break;
     }
 
-    switch (CFG.Newfiles) {
+    switch (CFG.AskNewfiles) {
 	case NO:    usrconfig.ieFILE = FALSE;
 		    break;
 	case YES:   usrconfig.ieFILE = TRUE;
diff --git a/mbsetup/ledit.h b/mbsetup/ledit.h
index 5c9f89a3..ea91c0d2 100644
--- a/mbsetup/ledit.h
+++ b/mbsetup/ledit.h
@@ -70,7 +70,7 @@ int 		edit_linetype(int, int, int);
 char		*getmagictype(int);
 void		show_magictype(int, int, int);
 int		edit_magictype(int, int, int);
-char		*get_asktype(int, int, int);
+char		*get_asktype(int);
 void		show_asktype(int, int, int);
 int		edit_asktype(int, int, int);
 char		*get_sessiontype(int);