--- loncom/interface/loncreateuser.pm	2002/04/29 14:32:11	1.34
+++ loncom/interface/loncreateuser.pm	2002/06/05 18:11:15	1.36
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.34 2002/04/29 14:32:11 matthew Exp $
+# $Id: loncreateuser.pm,v 1.36 2002/06/05 18:11:15 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,7 +47,7 @@
 # 11/12,11/13,11/15 Scott Harrison
 # 02/11/02 Matthew Hall
 #
-# $Id: loncreateuser.pm,v 1.34 2002/04/29 14:32:11 matthew Exp $
+# $Id: loncreateuser.pm,v 1.36 2002/06/05 18:11:15 matthew Exp $
 ###
 
 package Apache::loncreateuser;
@@ -532,9 +532,12 @@ ENDTHREEHEAD
 	$amode='localauth';
 	$genpwd=$ENV{'form.locarg'};
 	$genpwd=" " if (!$genpwd);
-    } elsif (($ENV{'form.login'} eq 'nochange')) { 
+    } elsif (($ENV{'form.login'} eq 'nochange') ||
+             ($ENV{'form.login'} eq ''        )) { 
         # There is no need to tell the user we did not change what they
         # did not ask us to change.
+        # If they are creating a new user but have not specified login
+        # information this will be caught below.
     } else {
 	    $r->print($error.'Invalid login mode or password'.$end);    
 	    return;
@@ -574,7 +577,8 @@ ENDNEWUSERHEAD
                                                $ENV{'form.ccdomain'});
         $r->print('<br>Home server: '.$home.' '.
                   $Apache::lonnet::libserv{$home});
-    } elsif ($ENV{'form.login'} ne 'nochange') {
+    } elsif (($ENV{'form.login'} ne 'nochange') &&
+             ($ENV{'form.login'} ne ''        )) {
 	# Modify user privileges
 	$r->print(<<ENDMODIFYUSERHEAD);
 <h1>Change User Privileges</h1>
@@ -585,7 +589,7 @@ ENDMODIFYUSERHEAD
 	    return;
 	}
 	# Only allow authentification modification if the person has authority
-	if (&Apache::lonnet::allowed('mau',$ENV{'user.domain'})) {
+	if (&Apache::lonnet::allowed('mau',$ENV{'form.ccdomain'})) {
 	    $r->print('Modifying authentication: '.
                       &Apache::lonnet::modifyuserauth(
 		       $ENV{'form.ccdomain'},$ENV{'form.ccuname'},