diff --git a/account/newuser.in b/account/newuser.in
index 52d5030dfccf41435e37093e085b3078dc78d756..4294cfffbe85c90da421c3fb8566388c971f2ea0 100644
--- a/account/newuser.in
+++ b/account/newuser.in
@@ -143,8 +143,7 @@ my %required = ("name"		=> "usr_name",
 		"phone"		=> "usr_phone",
 		"title"		=> "usr_title",
 		"affiliation"	=> "usr_affil",
-		"password"	=> undef,
-		"wikiname"	=> "wikiname");
+		"password"	=> undef);
 
 my %optional = ("login"		=> "uid",
 		"address2"	=> "usr_addr2",
@@ -152,6 +151,8 @@ my %optional = ("login"		=> "uid",
 		"shell"		=> "usr_shell",
 		"pubkey"        => undef);
 
+($WIKISUPPORT ? \%required : \%optional)->{"wikiname"} = "wikiname";
+
 #
 # Must wrap the parser in eval since it exits on error.
 #