--- loncom/interface/createaccount.pm	2014/05/05 21:28:10	1.65
+++ loncom/interface/createaccount.pm	2025/02/18 17:45:11	1.90
@@ -4,7 +4,7 @@
 # kerberos, or SSO) or an e-mail address. Requests to use an e-mail address as
 # username may be processed automatically, or may be queued for approval.
 #
-# $Id: createaccount.pm,v 1.65 2014/05/05 21:28:10 raeburn Exp $
+# $Id: createaccount.pm,v 1.90 2025/02/18 17:45:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -94,17 +94,24 @@ sub handler {
     my $lonhost = $r->dir_config('lonHostID');
     my $include = $r->dir_config('lonIncludes');
     my $start_page;
+    my $args = {};
 
+    (undef,undef,undef,my $clientmathml,my $clientunicode) =
+        &Apache::loncommon::decode_user_agent();
+    if ($clientunicode && !$clientmathml) {
+        $args->{'browser.unicode'} = 1;
+    }
     my $handle = &Apache::lonnet::check_for_valid_session($r);
     if (($handle ne '') && ($handle !~ /^publicuser_\d+$/)) {
         $start_page =
-            &Apache::loncommon::start_page('Already logged in');
+            &Apache::loncommon::start_page('Already logged in',undef,$args);
         my $end_page =
             &Apache::loncommon::end_page();
-        $r->print($start_page."\n".'<h2>'.&mt('You are already logged in').'</h2>'.
+        $r->print($start_page."\n".'<div class="LC_landmark" role="main">'.
+                  '<h2 class="LC_heading_2">'.&mt('You are already logged in').'</h2>'.
                   '<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',
                             '<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').
-                  '</p><p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'.$end_page);
+                  '</p><p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p></div>'.$end_page);
         return OK;
     }
 
@@ -124,7 +131,7 @@ sub handler {
 
         my %domconfig = 
             &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
-        my ($cancreate,$statustocreate,$emailusername) = 
+        my ($cancreate,$statustocreate) = 
             &get_creation_controls($domain,$domconfig{'usercreation'});
 
         my ($result,$output) =
@@ -139,24 +146,45 @@ sub handler {
             &print_footer($r);
             return OK;
         } else {
-            $start_page = &Apache::loncommon::start_page($title,$js); 
+            $start_page = &Apache::loncommon::start_page($title,$js,$args); 
             &print_header($r,$start_page,$courseid);
             $r->print($output);
             &print_footer($r);    
             return OK;
         }
     }
-    $start_page = &Apache::loncommon::start_page($title,$js);
 
-    my %domconfig = 
+    my %domconfig =
         &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
-    my ($cancreate,$statustocreate,$emailusername) = 
+    my ($cancreate,$statustocreate,$statusforemail,$emailusername,
+        $emailoptions,$verification,$emaildomain,$types,$usertypes,$othertitle) =
         &get_creation_controls($domain,$domconfig{'usercreation'});
+    my ($pagetitle,$need_affiliation);
+    if (ref($cancreate) eq 'ARRAY') {
+        unless (($env{'form.token'}) || ($sso_username ne '') || ($env{'form.phase'}) ||
+                ($env{'form.create_with_email'})) {
+            if ((grep(/^email$/,@{$cancreate})) && (ref($statusforemail) eq 'ARRAY')) {
+                my $usertype = &get_usertype($domain);
+                if ((($usertype eq '') || (!grep(/^\Q$usertype\E$/,@{$statusforemail}))) && 
+                    (@{$statusforemail} > 0)) {
+                    $js .= &setelements_js($statusforemail,$types,$usertypes,$othertitle);
+                    $args->{'add_entries'} = { 'onload' => "setElements();"};
+                    if ((@{$cancreate} == 1) && (@{$statusforemail} > 0)) {
+                        $pagetitle = 'Select affiliation';
+                    }
+                    $need_affiliation = 1;
+                } else {
+                    $js .= &username_js();
+                }
+            }
+        }
+    }
+    $start_page = &Apache::loncommon::start_page($title,$js,$args);
     if (@{$cancreate} == 0) {
-        &print_header($r,$start_page,$courseid);
-        my $output = '<h3>'.&mt('Account creation unavailable').'</h3>'.
+        &print_header($r,$start_page,$courseid,$pagetitle);
+        my $output = '<h2 class="LC_heading_2">'.&mt('Account creation unavailable').'</h2>'.
                      '<span class="LC_warning">'.
-                     &mt('Creation of a new user account using an e-mail address or an institutional log-in ID as username is not permitted at this institution ([_1]).',$domdesc).
+                     &mt('Creation of a new user account using an institutional log-in ID or e-mail verification is not permitted for: [_1].',$domdesc).
                      '</span><br /><br />';
         $r->print($output);
         &print_footer($r);
@@ -168,7 +196,7 @@ sub handler {
         my ($msg,$sso_logout);
         $sso_logout = &sso_logout_frag($r,$domain);
         if (grep(/^sso$/,@{$cancreate})) {
-            $msg = '<h3>'.&mt('Account creation').'</h3>'.
+            $msg = '<h2 class="LC_heading_2">'.&mt('Account creation').'</h2>'.
                    &mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account at this institution.").'<br />';
             my $shibenv;
             if (($r->dir_config('lonOtherAuthen') eq 'yes') && 
@@ -178,7 +206,6 @@ sub handler {
                         if (ref($domconfig{'usercreation'}{'cancreate'}{'shibenv'}) eq 'HASH') {
                             my @possfields = ('firstname','middlename','lastname','generation',
                                               'permanentemail','id');
-                            my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($domain);
                             $shibenv= {};
                             foreach my $key (keys(%{$domconfig{'usercreation'}{'cancreate'}{'shibenv'}})) {
                                 if ($key eq 'inststatus') {
@@ -203,7 +230,7 @@ sub handler {
                                     $lonhost,$contact_email,$contact_name,
                                     $sso_logout,$statustocreate,$shibenv);
         } else {
-            $msg = '<h3>'.&mt('Account creation unavailable').'</h3>'.
+            $msg = '<h2 class="LC_heading_2">'.&mt('Account creation unavailable').'</h2>'.
                    '<span class="LC_warning">'.&mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account at this institution, and you are not permitted to create one.").'</span><br /><br />'.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email).'<hr />'.
                    $sso_logout;
         }
@@ -215,11 +242,10 @@ sub handler {
     my ($output,$nostart,$noend,$redirect);
     my $token = $env{'form.token'};
     if ($token) {
-        my $usertype = &get_usertype($domain);
         ($output,$nostart,$noend,$redirect) = 
             &process_mailtoken($r,$token,$contact_name,$contact_email,$domain,
                                $domdesc,$lonhost,$include,$start_page,$cancreate,
-                               $domconfig{'usercreation'},$usertype);
+                               $domconfig{'usercreation'},$types);
         if ($redirect) {
             $r->internal_redirect('/adm/switchserver');
             return OK;
@@ -238,7 +264,35 @@ sub handler {
             return OK;
         }
     }
-
+    my ($usernameset,$condition,$excluded,$hascustom);
+    if ((grep(/^email$/,@{$cancreate})) && (($env{'form.create_with_email'}) ||
+                                            ((!$token) && ($env{'form.phase'} eq '')))) {
+        my $usertype = &get_usertype($domain);
+        if ($usertype eq '') {
+            $usertype = 'default';
+        }
+        if (ref($verification) eq 'HASH') {
+            if ($verification->{$usertype} =~ /^(free|first)$/) {
+                $usernameset = $verification->{$usertype};
+            }
+        }
+        if (ref($emailoptions) eq 'HASH') {
+            if ($emailoptions->{$usertype} =~ /^(inst|noninst)$/) {
+                my $chosen = $1;
+                if (ref($emaildomain) eq 'HASH') {
+                    if (ref($emaildomain->{$usertype}) eq 'HASH') {
+                        if ($chosen eq 'inst') {
+                            $condition = $emaildomain->{$usertype}->{$chosen};
+                        } else {
+                            $excluded = $emaildomain->{$usertype}->{$chosen};
+                        }
+                    }
+                }
+            } elsif ($emailoptions->{$usertype} eq 'custom') {
+                $hascustom = 1;
+            }
+        }
+    }
     if ($env{'form.phase'} eq 'username_activation') {
         (my $result,$output,$nostart) = 
             &username_activation($r,$env{'form.uname'},$domain,$domdesc,
@@ -270,31 +324,35 @@ sub handler {
     } elsif ($env{'form.create_with_email'}) {
         &print_header($r,$start_page,$courseid);
         my $usertype = &get_usertype($domain);
+        if ($usertype eq '') {
+            $usertype = 'default';
+        }
         $output = &process_email_request($env{'form.uname'},$domain,$domdesc,
                                          $contact_name,$contact_email,$cancreate,
                                          $lonhost,$domconfig{'usercreation'},
-                                         $emailusername,$courseid,$usertype);
+                                         $emailusername,$courseid,$usertype,
+                                         $usernameset,$condition,$excluded,$hascustom);
     } elsif (!$token) {
-        &print_header($r,$start_page,$courseid);
+        &print_header($r,$start_page,$courseid,$pagetitle);
         my $now=time;
-        my $gotlondes;
-        if (grep(/^login$/,@{$cancreate})) {
-            if (open(my $jsh,"<$include/londes.js")) {
+        if ((grep(/^login$/,@{$cancreate})) &&
+            ((!grep(/^email$/,@{$cancreate})) || ($need_affiliation))) {
+            if (open(my $jsh,"<","$include/londes.js")) {
                 while(my $line = <$jsh>) {
                     $r->print($line);
                 }
                 close($jsh);
                 $r->print(&javascript_setforms($now));
-                $gotlondes = 1;
             }
         }
         if (grep(/^email$/,@{$cancreate})) {
-            $r->print(&javascript_validmail());
+            $r->print(&javascript_validmail($condition));
         }
         my $usertype = &get_usertype($domain);
         $output = &print_username_form($r,$domain,$domdesc,$cancreate,$now,$lonhost,
-                                       $include,$courseid,$gotlondes,$emailusername,
-                                       $usertype);
+                                       $include,$courseid,$emailusername,
+                                       $statusforemail,$usernameset,$condition,
+                                       $excluded,$usertype,$types,$usertypes,$othertitle);
     }
     $r->print($output);
     &print_footer($r);
@@ -302,16 +360,25 @@ sub handler {
 }
 
 sub print_header {
-    my ($r,$start_page,$courseid) = @_;
+    my ($r,$start_page,$courseid,$pagetitle) = @_;
     $r->print($start_page);
     &Apache::lonhtmlcommon::clear_breadcrumbs();
+    my $url = '/adm/createaccount';
+    if ($pagetitle eq '') {
+        $pagetitle = 'New username';
+    }
     if ($courseid ne '') {
         my %coursehash = &Apache::lonnet::coursedescription($courseid);
         &selfenroll_crumbs($r,$courseid,$coursehash{'description'});
     }
+    if ($env{'form.reportedtype'}) {
+        &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>$url,
+          text=>"Select affiliation"});
+    }
     &Apache::lonhtmlcommon::add_breadcrumb
-    ({href=>"/adm/createuser",
-      text=>"New username"});
+    ({href=>$url,
+      text=>$pagetitle});
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Create account'));
     return;
 }
@@ -322,7 +389,7 @@ sub print_footer {
         $r->print('<form name="backupcrumbs" method="post" action="">'.
                   &Apache::lonhtmlcommon::echo_form_input(['backto','logtoken',
                       'token','serverid','uname','upass','phase','create_with_email',
-                      'code','crypt','cfirstname','clastname',
+                      'code','crypt','cfirstname','clastname','g-recaptcha-response',
                       'recaptcha_challenge_field','recaptcha_response_field',
                       'cmiddlename','cgeneration','cpermanentemail','cid']).
                   '</form>');
@@ -332,7 +399,7 @@ sub print_footer {
 
 sub get_usertype {
     my ($domain) = @_;
-    my $usertype = 'default';
+    my $usertype;
     my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($domain);
     if (ref($types) eq 'ARRAY') {
         push(@{$types},'default');
@@ -369,7 +436,7 @@ sub selfenroll_crumbs {
 }
 
 sub javascript_setforms {
-    my ($now,$emailusername,$captcha,$usertype) =  @_;
+    my ($now,$emailusername,$captcha,$usertype,$recaptchaversion,$usernameset,$condition,$excluded) =  @_;
     my ($setuserinfo,@required,$requiredchk);
     if (ref($emailusername) eq 'HASH') {
         if (ref($emailusername->{$usertype}) eq 'HASH') {  
@@ -379,19 +446,28 @@ sub javascript_setforms {
                 }
                 $setuserinfo .= '                    server.elements.'.$key.'.value=client.elements.'.$key.'.value;'."\n";
             }
-            $setuserinfo .= '                    server.elements.type.value=client.elements.type.value;'."\n"; 
+            if ($usertype ne '') {
+                $setuserinfo .= '                    server.elements.type.value=client.elements.type.value;'."\n";
+            }
         }
         if ($captcha eq 'original') {
             $setuserinfo .= '                    server.elements.code.value=client.elements.code.value;'."\n".
                             '                    server.elements.crypt.value=client.elements.crypt.value;'."\n";
         } elsif ($captcha eq 'recaptcha') {
-            $setuserinfo .= 
+            if ($recaptchaversion ne '2') {
+                $setuserinfo .=
                 '                    server.elements.recaptcha_challenge_field.value=client.elements.recaptcha_challenge_field.value;'."\n".
                 '                    server.elements.recaptcha_response_field.value=client.elements.recaptcha_response_field.value;'."\n";
+            }
+        }
+        if ($usernameset eq 'free') {
+            $setuserinfo .=
+                '                    server.elements.username.value=client.elements.username.value;'."\n";
         }
     }
     if (@required) {
         my $missprompt = &mt('One or more required fields are currently blank.');
+        &js_escape(\$missprompt);
         my $reqstr = join("','",@required);
         $requiredchk = <<"ENDCHK";
                 var requiredfields = new Array('$reqstr');
@@ -431,10 +507,8 @@ $requiredchk
                 uextkey=client.elements.uextkey.value;
                 lextkey=client.elements.lextkey.value;
                 initkeys();
-
                 server.elements.upass.value
-                    = crypted(client.elements.upass$now.value);
-
+                    = getCrypted(client.elements.upass$now.value);
                 client.elements.uname.value='';
                 client.elements.upass$now.value='';
                 if (context == 'email') {
@@ -446,17 +520,25 @@ $setuserinfo
         }
         return false;
     }
+
 // ]]>
 </script>
 ENDSCRIPT
+    if (($captcha eq 'recaptcha') && ($recaptchaversion eq '2')) {
+        $js .= "\n".'<script src="https://www.google.com/recaptcha/api.js"></script>'."\n";
+    }
     return $js;
 }
 
 sub javascript_checkpass {
-    my ($now,$context) = @_;
+    my ($now,$context,$domain) = @_;
     my $nopass = &mt('You must enter a password.');
-    my $mismatchpass = &mt('The passwords you entered did not match.').'\\n'.
+    my $mismatchpass = &mt('The passwords you entered did not match.')."\n".
                        &mt('Please try again.'); 
+    my ($numrules,$intargjs) =
+        &Apache::loncommon::passwd_validation_js('upass',$domain);
+    &js_escape(\$nopass);
+    &js_escape(\$mismatchpass);
     my $js = <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
@@ -471,6 +553,10 @@ sub javascript_checkpass {
                 return false;
             }
             if (upass == upasscheck) {
+                var numrules = $numrules;
+                if (numrules > 0) {
+$intargjs
+                }
                 client.elements.upasscheck$now.value='';
                 if (validate_email(client)) {
                     send(one,two,'$context');
@@ -490,18 +576,26 @@ ENDSCRIPT
 }
 
 sub javascript_validmail {
-    my %lt = &Apache::lonlocal::texthash (
+    my ($condition) = @_;
+    my %js_lt = &Apache::lonlocal::texthash (
                email => 'The e-mail address you entered',
                notv  => 'is not a valid e-mail address',
+               avae  => 'A valid e-mail address is not formed when the value you entered is combined with the required domain',
     );
     my $output =  "\n".'<script type="text/javascript">'."\n".
                   '// <![CDATA['."\n".
                   &Apache::lonhtmlcommon::javascript_valid_email()."\n";
+    &js_escape(\%js_lt);
     $output .= <<"ENDSCRIPT";
 function validate_email(client) {
     field = client.uname;
-    if (validmail(field) == false) {
-        alert("$lt{'email'}: "+field.value+" $lt{'notv'}.");
+    var condition = '$condition';
+    if (validmail(field,condition) == false) {
+        if ((condition != undefined) && (condition != '')) {
+            alert("$js_lt{'avae'}: "+condition);
+        } else {
+            alert("$js_lt{'email'}: "+field.value+" $js_lt{'notv'}.");
+        }
         return false;
     }
     return true;
@@ -512,26 +606,24 @@ ENDSCRIPT
 }
 
 sub print_username_form {
-    my ($r,$domain,$domdesc,$cancreate,$now,$lonhost,$include,$courseid,$gotlondes,$emailusername,
-        $usertype) = @_;
+    my ($r,$domain,$domdesc,$cancreate,$now,$lonhost,$include,$courseid,$emailusername,
+        $statusforemail,$usernameset,$condition,$excluded,$usertype,$types,$usertypes,
+        $othertitle) = @_;
     my %lt = &Apache::lonlocal::texthash (
-                                         unam => 'username',
-                                         udom => 'domain',
-                                         uemail => 'E-mail address in LON-CAPA',
-                                         proc => 'Proceed',
                                          crac => 'Create account with a username provided by this institution',
                                          clca => 'Create LON-CAPA account',
                                          type => 'Type in your log-in ID and password to find out.',
                                          plse => 'Please provide a password for your new account.',
                                          info => 'Please provide user information and a password for your new account.',
                                          yopw => 'Your password will be encrypted when sent (and stored).',
+                                         crae => 'Create account using e-mail address verification',
                                          );
     my $output;
     if (ref($cancreate) eq 'ARRAY') {
         if (grep(/^login$/,@{$cancreate})) {
             my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
             if ((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth')) {
-                $output = '<div class="LC_left_float"><h3>'.$lt{'crac'}.'</h3>';
+                $output = '<div class="LC_left_float"><h2 class="LC_heading_2">'.$lt{'crac'}.'</h2>';
                 $output .= &mt('If you already have a log-in ID at this institution [_1]you may be able to use it for LON-CAPA.','<br />').
                            '<br /><br />'.
                            $lt{'type'}.
@@ -541,44 +633,104 @@ sub print_username_form {
             }
         }
         if (grep(/^email$/,@{$cancreate})) {
-            $output .= '<div class="LC_left_float"><h3>'.&mt('Create account with an e-mail address as your username').'</h3>';
-            my ($captchaform,$error,$captcha) = &Apache::loncommon::captcha_display('usercreation',$lonhost);
-            if ($error) {
-                my $helpdesk = '/adm/helpdesk?origurl=%2fadm%2fcreateaccount';
-                if ($courseid ne '') {
-                    $helpdesk .= '&courseid='.$courseid;
-                }
-                $output .= '<span class="LC_error">'.
-                           &mt('An error occurred generating the validation code[_1] required for an e-mail address to be used as username.','<br />').
-                           '</span><br /><br />'.
-                           &mt('[_1]Contact the helpdesk[_2] or [_3]reload[_2] the page and try again.',
-                               '<a href="'.$helpdesk.'">','</a>','<a href="javascript:window.location.reload()">');
+            $output .= '<div class="LC_left_float"><h2 class="LC_heading_2">'.$lt{'crae'}.'</h2>';
+            if ($usertype ne '') {
+                if ((ref($statusforemail) eq 'ARRAY') && (@{$statusforemail} > 0)) {
+                    unless (grep(/^\Q$usertype\E$/,@{$statusforemail})) {
+                        undef($usertype);
+                    }
+                } elsif ($usertype ne 'default') {
+                    undef($usertype);
+                }
+            }
+            if (($usertype eq '') && (ref($statusforemail) eq 'ARRAY') && 
+                (@{$statusforemail} > 0) && (ref($types) eq 'ARRAY') && (@{$types} > 0)) {
+                my @posstypes = @{$types};
+                unless (grep(/^default$/,@posstypes)) {
+                    push(@posstypes,'default');
+                }
+                $output .= '<form name="reportstatus" id="LC_reportstatus" action="/adm/createaccount" method="post" '.
+                           'onsubmit="return checkVerification();"><fieldset><legend>'.
+                           &mt('Choose your affiliation at [_1]',$domdesc).'</legend>';
+                foreach my $type (@posstypes) {
+                    my $name;
+                    if ($type eq 'default') {
+                        $name = $othertitle;
+                    } else {
+                        $name = $type;
+                        if (ref($usertypes) eq 'HASH') {
+                            if (exists($usertypes->{$type})) {
+                                $name = $usertypes->{$type};
+                            }
+                        }
+                    }
+                    my $checked;
+                    if ($env{'form.type'} eq $type) {
+                        $checked = ' checked="checked"';
+                    }
+                    $output .= '<label><input type="radio" name="type" value="'.$type.'"'.$checked.' />'.
+                               $name.'</label>'.('&nbsp;'x2);
+                }
+                if ($env{'form.courseid'} =~ /^$match_domain\_$match_courseid$/) {
+                    $output .= "\n".'<input type="hidden" name="courseid" value="'.$env{'form.courseid'}.'" />';
+                }
+                $output .= "\n".'<p><input type="submit" name="reportedtype" value="'.&mt('Submit').'" />'.
+                           '</p></fieldset></form>'."\n";
             } else {
-                if (grep(/^login$/,@{$cancreate})) {
-                    $output .= &mt('If you do not have a log-in ID at your institution, [_1]provide your e-mail address to request a LON-CAPA account.','<br />').'<br /><br />'.
-                               $lt{'plse'}.'<br />'.
-                               $lt{'yopw'}.'<br />';
+                my ($captchaform,$error,$captcha,$recaptchaversion) = 
+                    &Apache::loncommon::captcha_display('usercreation',$lonhost);
+                if ($error) {
+                    my $helpdesk = '/adm/helpdesk?origurl=%2fadm%2fcreateaccount';
+                    if ($courseid ne '') {
+                        $helpdesk .= '&courseid='.$courseid;
+                    }
+                    $output .= '<span class="LC_error">'.
+                               &mt('An error occurred generating the validation code[_1] required for use of an e-mail address to request a LON-CAPA account.','<br />').
+                               '</span><br /><br />'.
+                               &mt('[_1]Contact the helpdesk[_2] or [_3]reload[_2] the page and try again.',
+                                   '<a href="'.$helpdesk.'">','</a>','<a href="javascript:window.location.reload()">');
                 } else {
-                    my $prompt = $lt{'plse'};
-                    if (ref($emailusername) eq 'HASH') {
-                        if (ref($emailusername->{$usertype}) eq 'HASH') {
-                            if (keys(%{$emailusername->{$usertype}}) > 0) {
-                                $prompt = $lt{'info'};
+                    if (grep(/^login$/,@{$cancreate})) {
+                        $output .= &mt('If you do not have a log-in ID at your institution, [_1]provide your e-mail address to request a LON-CAPA account.','<br />').'<br /><br />'.
+                                   $lt{'plse'}.'<br />'.
+                                   $lt{'yopw'}.'<br />';
+                    } else {
+                        my $prompt = $lt{'plse'};
+                        if (ref($emailusername) eq 'HASH') {
+                            if (ref($emailusername->{$usertype}) eq 'HASH') {
+                                if (keys(%{$emailusername->{$usertype}}) > 0) {
+                                    $prompt = $lt{'info'};
+                                }
                             }
                         }
+                        $output .= $prompt.'<br />'.
+                                   $lt{'yopw'}.'<br />';
                     }
-                    $output .= $prompt.'<br />'.
-                               $lt{'yopw'}.'<br />';
+                    if ($usertype eq '') {
+                        $usertype = 'default';
+                    } elsif (ref($usertypes) eq 'HASH') {
+                        my $usertitle;
+                        if ($usertype eq 'default') {
+                            $usertitle = $othertitle;
+                        } elsif (exists($usertypes->{$usertype})) {
+                            $usertitle = $usertypes->{$usertype};
+                        }
+                        if ($usertitle ne '') {
+                            $output .= &mt('Self-reported affiliation: [_1]',
+                                           '<span style="font-style: italic;">'.$usertitle.'</span>').
+                                       '<br />';
+                        }
+                    }
+                    $output .= &print_dataentry_form($r,$domain,$lonhost,$include,$now,$captchaform,
+                                                     $courseid,$emailusername,$captcha,$usertype,
+                                                     $recaptchaversion,$usernameset,$condition,$excluded);
                 }
-                $output .= &print_dataentry_form($r,$domain,$lonhost,$include,$now,$captchaform,
-                                                 $courseid,$gotlondes,$emailusername,$captcha,
-                                                 $usertype);
             }
             $output .= '</div>';
         }
     }
     if ($output eq '') {
-        $output = &mt('Creation of a new LON-CAPA user account using an e-mail address or an institutional log-in ID as your username is not permitted at [_1].',$domdesc);
+        $output = &mt('Creation of a new LON-CAPA user account using an institutional log-in ID or verification by e-mail is not permitted at [_1].',$domdesc);
     } else {
         $output .= '<div class="LC_clear_float_footer"></div>';
     }
@@ -597,15 +749,15 @@ sub login_box {
     my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount:createaccount',
                                        $lonhost);
     $output = &serverform($logtoken,$lonhost,undef,$courseid,$context);
-    my $unameform = '<input type="text" name="uname" size="20" value="" autocomplete="off" />';
-    my $upassform = '<input type="password" name="upass'.$now.'" size="20" autocomplete="off" />';
+    my $unameform = '<input type="text" name="uname" id="uname" size="20" value="" autocomplete="off" />';
+    my $upassform = '<input type="password" name="upass'.$now.'" id="upass'.$now.'" size="20" autocomplete="new-password" />';
     $output .= '<form name="client" method="post" action="" onsubmit="return(send('."'server','client'".'));">'."\n".
                &Apache::lonhtmlcommon::start_pick_box()."\n".
-               &Apache::lonhtmlcommon::row_title($titles{$context},
+               &Apache::lonhtmlcommon::row_title('<label for="uname">'.$titles{$context}.'</label>',
                                                  'LC_pick_box_title')."\n".
                $unameform."\n".
                &Apache::lonhtmlcommon::row_closure(1)."\n".
-               &Apache::lonhtmlcommon::row_title(&mt('Password'),
+               &Apache::lonhtmlcommon::row_title('<label for="upass'.$now.'">'.&mt('Password').'</label>',
                                                 'LC_pick_box_title')."\n".
                $upassform;
     if ($context eq 'selfenroll') {
@@ -619,7 +771,8 @@ sub login_box {
         $output .= '<input type="hidden" name="udom" value="'.$domain.'" />';
     }
     $output .= &Apache::lonhtmlcommon::row_closure(1).
-               &Apache::lonhtmlcommon::row_title().
+               &Apache::lonhtmlcommon::row_title('<span class="LC_visually_hidden">'.
+                                                 &mt('Submit').'</span>','','','',1).
                '<br /><input type="submit" name="username_validation" value="'.
                $submit_text.'" />'."\n";
     if ($context eq 'selfenroll') {
@@ -638,26 +791,61 @@ sub login_box {
 
 sub process_email_request {
     my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate,
-        $server,$settings,$emailusername,$courseid,$usertype) = @_;
-    my $output;
+        $server,$settings,$emailusername,$courseid,$usertype,$usernameset,
+        $condition,$excluded,$hascustom) = @_;
+    my ($output,$uname);
     if (ref($cancreate) eq 'ARRAY') {
         if (!grep(/^email$/,@{$cancreate})) {
             $output = &invalid_state('noemails',$domdesc,
                                      $contact_name,$contact_email);
             return $output;
-        } elsif ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {
+        } elsif ((($condition ne '') && ($useremail !~ /^[^\@]+$/)) ||
+                 (($condition eq '') && ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/))) {
             $output = &invalid_state('baduseremail',$domdesc,
                                      $contact_name,$contact_email);
             return $output;
         } else {
             $useremail =~ s/^\s+|\s+$//g;
-            my $uname=&LONCAPA::clean_username($useremail);
-            if ($useremail ne $uname) {
-                $output = &invalid_state('badusername',$domdesc,
-                                         $contact_name,$contact_email);
-                return $output;
+            my $possuname;
+            if ($condition ne '') {
+                if ($usernameset eq 'first') {
+                    $possuname = $useremail;
+                }
+                $useremail .= $condition;
+            } elsif ($excluded ne '') {
+                if ($useremail =~ /^[^\@]+\Q$excluded\E$/) {
+                    $output = &invalid_state('userrules',$domdesc,
+                                     $contact_name,$contact_email);
+                    return $output;
+                } 
+            }
+            if (($usernameset eq 'free') && ($env{'form.username'} ne '')) {
+                $possuname = $env{'form.username'};
+            } elsif (($usernameset eq 'first') && ($condition eq '')) {
+                if ($condition eq '') {
+                    ($possuname) = ($useremail =~ /^([^\@]+)\@/);
+                }
             }
-            my $uhome = &Apache::lonnet::homeserver($useremail,$domain);
+            if ($possuname ne '') {
+                $possuname  =~ s/^\s+|\s+$//g;
+                if ($possuname ne '') {
+                    $uname=&LONCAPA::clean_username($possuname);
+                    if ($uname ne $possuname) {
+                        $output = &invalid_state('badusername',$domdesc,
+                                                 $contact_name,$contact_email);
+                        return $output;
+                    }
+                }
+            }
+            if ($possuname eq '') {
+                $uname=&LONCAPA::clean_username($useremail);
+                if ($useremail ne $uname) {
+                    $output = &invalid_state('badusername',$domdesc,
+                                             $contact_name,$contact_email);
+                    return $output;
+                }
+            }
+            my $uhome = &Apache::lonnet::homeserver($uname,$domain);
             if ($uhome ne 'no_host') {
                 $output = &invalid_state('existinguser',$domdesc,
                                          $contact_name,$contact_email);
@@ -665,36 +853,55 @@ sub process_email_request {
             } else {
                 my ($captcha_chk,$captcha_error) = &Apache::loncommon::captcha_response('usercreation',$server);
                 if ($captcha_chk != 1) {
-                    $output = &invalid_state('captcha',$domdesc,$contact_name,
-                                             $contact_email,$captcha_error);
+                    $output = '<span class="LC_warning">'.
+                              &mt('Validation of the code you entered failed.').'</span>'.
+                              '<br />'.$captcha_error."\n".'<br /><p>'.
+                               &mt('[_1]Return[_2] to the previous page to try again.',
+                                   '<a href="javascript:document.retryemail.submit();">','</a>')."\n".
+                              '<form name="retryemail" action="/adm/createaccount" method="post" />'.
+                              '<input type="hidden" name="domain" value="'.$domain.'" />'."\n";
+                    if ($env{'form.courseid'} =~ /^$match_domain\_$match_courseid$/) {
+                        $output .= '<input type="hidden" name="courseid" value="'.$env{'form.courseid'}.'" />'."\n";
+                    }
+                    if ($env{'form.type'}) {
+                        my $usertype = &get_usertype($domain);
+                        if ($usertype ne '') {
+                            $output .= '<input type="hidden" name="type" value="'.$usertype.'" />'."\n".
+                                       '<input type="hidden" name="reportedtype" value="'.&mt('Submit').'" />'."\n";
+                        }
+                    }
+                    $output .= '</form></p>';
                     return $output;
                 }
                 my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts);
-                &call_rulecheck($useremail,$domain,\%alerts,\%rulematch,
+                &call_rulecheck($uname,$domain,\%alerts,\%rulematch,
                                 \%inst_results,\%curr_rules,\%got_rules,'username');
                 if (ref($alerts{'username'}) eq 'HASH') {
                     if (ref($alerts{'username'}{$domain}) eq 'HASH') {
-                        if ($alerts{'username'}{$domain}{$useremail}) {
+                        if ($alerts{'username'}{$domain}{$uname}) {
                             $output = &invalid_state('userrules',$domdesc,
                                                      $contact_name,$contact_email);
                             return $output;
                         }
                     }
                 }
-                my $format_msg = 
-                    &guest_format_check($useremail,$domain,$cancreate,
-                                        $settings);
-                if ($format_msg) {
-                    $output = &invalid_state('userformat',$domdesc,$contact_name,
-                                             $contact_email,$format_msg);
-                    return $output;
+                if ($hascustom) {
+                    my $format_msg = 
+                        &guest_format_check($useremail,$domain,$cancreate,
+                                            $settings,$usertype);
+                    if ($format_msg) {
+                        $output = &invalid_state('userformat',$domdesc,$contact_name,
+                                                 $contact_email,$format_msg);
+                        return $output;
+                    }
                 }
             }
         }
         $output = &send_token($domain,$useremail,$server,$domdesc,$contact_name,
-                              $contact_email,$courseid,$emailusername,$usertype);
+                              $contact_email,$courseid,$emailusername,$usertype,
+                              $uname);
     }
-    return $output;
+    return '<div class="LC_landmark" role="main">'.$output.'</div>';
 }
 
 sub call_rulecheck {
@@ -713,25 +920,82 @@ sub call_rulecheck {
 
 sub send_token {
     my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid,$emailusername,
-        $usertype) = @_;
-    my $msg = '<h3>'.&mt('Account creation status').'</h3>'.
+        $usertype,$uname) = @_;
+    my $msg = '<h2 class="LC_heading_2">'.&mt('Account creation status').'</h2>'.
               &mt('Thank you for your request to create a new LON-CAPA account.').
               '<br /><br />';
     my $now = time;
     $env{'form.logtoken'} =~ s/(`)//g;
     if ($env{'form.logtoken'}) {
         my $logtoken = $env{'form.logtoken'};
+        my $earlyout;
         my $tmpinfo=Apache::lonnet::reply('tmpget:'.$logtoken,$server);
         if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {
             $msg = &mt('Information needed to process your request is missing, inaccessible or expired.')
-                  .'<br />'.&mt('Return to the previous page to try again.');
+                  .'<br /><p>'.&mt('[_1]Return[_2] to the previous page to try again.',
+                                   '<a href="javascript:document.retryemail.submit();">','</a>');
+            $earlyout = 1;
         } else {
             my $reply = &Apache::lonnet::reply('tmpdel:'.$logtoken,$server);
             unless ($reply eq 'ok') {
                 $msg .= &mt('Request could not be processed.');
             }
         }
-        my %info = ('ip'         => $ENV{'REMOTE_ADDR'},
+# Check if the password entered by the user satisfies domain's requirements
+        my %passwdconf = &Apache::lonnet::get_passwdconf($domain);
+        my ($min,$max,@chars);
+        $min = $Apache::lonnet::passwdmin;
+        if (ref($passwdconf{'chars'}) eq 'ARRAY') {
+            if ($passwdconf{'min'} =~ /^\d+$/) {
+                if ($passwdconf{'min'} > $min) {
+                    $min = $passwdconf{'min'};
+                }
+            }
+            if ($passwdconf{'max'} =~ /^\d+$/) {
+                $max = $passwdconf{'max'};
+            }
+            @chars = @{$passwdconf{'chars'}};
+        }
+        my $encpass = $env{'form.upass'};
+        if ($encpass eq '') {
+            $msg = &mt('Password retrieved was blank.').
+                   '<br /><p>'.&mt('[_1]Return[_2] to the previous page to try again.',
+                                   '<a href="javascript:document.retryemail.submit();">','</a>');
+            $earlyout = 1;
+        } else {
+# Split the logtoken to retrieve the DES key and decrypt the encypted password
+            my ($key,$caller)=split(/&/,$tmpinfo);
+            if ($caller eq 'createaccount') {
+                my $plainpass = &Apache::loncommon::des_decrypt($key,$encpass);
+                if (($min > 0) || ($max ne '') || (@chars > 0)) {
+                    my $warning = &Apache::loncommon::check_passwd_rules($domain,$plainpass);
+                    if ($warning) {
+                        $msg = $warning.
+                               '<p>'.&mt('[_1]Return[_2] to the previous page to try again.',
+                                         '<a href="javascript:document.retryemail.submit();">','</a>');
+                        $earlyout = 1;
+                    }
+                }
+            }
+        }
+        if ($earlyout) {
+            $msg .= '<form name="retryemail" action="/adm/createaccount" method="post" />'.
+                    '<input type="hidden" name="domain" value="'.$domain.'" />'."\n";
+            if ($env{'form.courseid'} =~ /^$match_domain\_$match_courseid$/) {
+                $msg .= '<input type="hidden" name="courseid" value="'.$env{'form.courseid'}.'" />'."\n";
+            }
+            if ($env{'form.type'}) {
+                my $usertype = &get_usertype($domain);
+                if ($usertype ne '') {
+                    $msg .= '<input type="hidden" name="type" value="'.$usertype.'" />'.
+                            '<input type="hidden" name="reportedtype" value="'.&mt('Submit').'" />'."\n";
+                }
+            }
+            $msg .= '</form></p>';
+            return $msg;
+        }
+        my $ip = &Apache::lonnet::get_requestor_ip();
+        my %info = ('ip'         => $ip,
                     'time'       => $now,
                     'domain'     => $domain,
                     'username'   => $email,
@@ -739,18 +1003,21 @@ sub send_token {
                     'upass'      => $env{'form.upass'},
                     'serverid'   => $env{'form.serverid'},
                     'tmpinfo'    => $tmpinfo);
-
+        if ($uname ne '') {
+            $info{'username'} = $uname;
+            $info{'email'} = $email;
+        }
         if (ref($emailusername) eq 'HASH') {
             if (ref($emailusername->{$usertype}) eq 'HASH') {
                 foreach my $item (keys(%{$emailusername->{$usertype}})) {
                     $info{$item} = $env{'form.'.$item};
                     $info{$item} =~ s/(`)//g;
                 }
-                unless ($usertype eq 'default') {
-                    $info{'inststatus'} = $usertype;
-                }
             }
         }
+        if ($usertype ne '') {
+           $info{'usertype'} = $usertype;
+        }
         my $token = &Apache::lonnet::tmpput(\%info,$server,'createaccount');
         if ($token !~ /^error/ && $token ne 'no_such_host') {
             my $esc_token = &escape($token);
@@ -784,7 +1051,7 @@ sub send_token {
 
 sub process_mailtoken {
     my ($r,$token,$contact_name,$contact_email,$domain,$domdesc,$lonhost,
-        $include,$start_page,$cancreate,$settings,$usertype) = @_;
+        $include,$start_page,$cancreate,$settings,$types) = @_;
     my ($msg,$nostart,$noend,$redirect);
     my %data = &Apache::lonnet::tmpget($token);
     my $now = time;
@@ -797,16 +1064,42 @@ sub process_mailtoken {
     }
     if (($data{'time'} =~ /^\d+$/) &&
         ($data{'domain'} ne '') &&
-        ($data{'username'}  =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/)) {
+        ((($data{'email'} =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) && ($data{'username'} =~ /^$match_username$/)) ||
+          ($data{'username'}  =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/))) {
         if ($now - $data{'time'} < 7200) {
 # Check if request should be queued.
             if (ref($cancreate) eq 'ARRAY') {
-                my $disposition;
+                my ($disposition,$usertype);
                 if (grep(/^email$/,@{$cancreate})) {
+                    if (exists($data{'usertype'})) {
+                        $usertype = $data{'usertype'};
+                        my @posstypes;
+                        if (ref($types) eq 'ARRAY') {
+                            @posstypes = @{$types};
+                            if (@posstypes) {
+                                unless (grep(/^default$/,@posstypes)) {
+                                    push(@posstypes,'default');
+                                }
+                            }
+                            if (grep(/\Q$usertype\E/,@posstypes)) {
+                                unless ($usertype eq 'default') {
+                                    $data{'inststatus'} = $usertype;
+                                }
+                            } else {
+                                $disposition = 'approval';
+                            }
+                        }
+                        delete($data{'usertype'});
+                    }
                     if (ref($settings) eq 'HASH') {
                         if (ref($settings->{'cancreate'}) eq 'HASH') {
                             if (ref($settings->{'cancreate'}{'selfcreateprocessing'}) eq 'HASH') {
-                                $disposition = $settings->{'cancreate'}{'selfcreateprocessing'}{$usertype}; 
+                                if ($usertype ne '') {
+                                    $disposition = $settings->{'cancreate'}{'selfcreateprocessing'}{$usertype};
+                                    unless ($disposition =~ /^(approval|automatic)$/) {
+                                        $disposition = 'approval';
+                                    }
+                                }
                             }
                         }
                     }
@@ -818,8 +1111,9 @@ sub process_mailtoken {
                             &create_account($r,$domain,$domdesc,\%data);
                         if ($result eq 'ok') {
                             $msg = $output;
+                            my $ip = &Apache::lonnet::get_requestor_ip();
                             my $shownow = &Apache::lonlocal::locallocaltime($now);
-                            my $mailmsg = &mt('A LON-CAPA account for the institution: [_1] has been created [_2] from IP address: [_3]. If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$domdesc,$shownow,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
+                            my $mailmsg = &mt('A LON-CAPA account for the institution: [_1] has been created [_2] from IP address: [_3]. If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$domdesc,$shownow,$ip,$contact_name,$contact_email)."\n";
                             my $mailresult = &Apache::resetpw::send_mail($domdesc,$data{'email'},
                                                                         $mailmsg,$contact_name,
                                                                         $contact_email);
@@ -860,8 +1154,8 @@ sub process_mailtoken {
 
 sub start_session {
     my ($r,$username,$domain,$uhome,$courseid,$token) = @_;
-
-    if ($r->dir_config('lonBalancer') eq 'yes') {
+    my ($is_balancer) = &Apache::lonnet::check_loadbalancing($username,$domain);
+    if ($is_balancer) {
         Apache::lonauth::success($r, $username, $domain, $uhome,
             'noredirect', undef, {});
 
@@ -875,7 +1169,6 @@ sub start_session {
             ($courseid ? "/adm/selfenroll?courseid=$courseid" : '/adm/roles'),
             undef, {}); 
     }
-
     return;
 }
 
@@ -885,50 +1178,69 @@ sub start_session {
 # Stores token to store DES-key and stage during creation session
 #
 sub print_dataentry_form {
-    my ($r,$domain,$lonhost,$include,$now,$captchaform,$courseid,$gotlondes,$emailusername,$captcha,
-        $usertype) = @_;
+    my ($r,$domain,$lonhost,$include,$now,$captchaform,$courseid,$emailusername,$captcha,
+        $usertype,$recaptchaversion,$usernameset,$condition,$excluded) = @_;
     my ($error,$output);
-    unless ($gotlondes) {
-        if (open(my $jsh,"<$include/londes.js")) {
-            while(my $line = <$jsh>) {
-                $r->print($line);
-            }
-            close($jsh);
-            $output = &javascript_setforms($now,$emailusername,$captcha,$usertype)."\n";
-            $gotlondes = 1;
-        }
-    }
-    if ($gotlondes) {
-        $output .= &javascript_checkpass($now,'email');
+    if (open(my $jsh,"<","$include/londes.js")) {
+        while(my $line = <$jsh>) {
+            $r->print($line);
+        }
+        close($jsh);
+        $output = &javascript_setforms($now,$emailusername,$captcha,$usertype,$recaptchaversion,
+                                       $usernameset,$condition,$excluded).
+                  "\n".&javascript_checkpass($now,'email',$domain);
         my ($lkey,$ukey) = &Apache::loncommon::des_keys();
         my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
         my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount:createaccount',
                                            $lonhost);
-        $output .=
+        my $showsubmit = 1;
+        my $serverform =
             '<form name="createaccount" method="post" target="_top" action="/adm/createaccount">';
         if ($courseid ne '') {
-            $output .= '<input type="hidden" name="courseid" value="'.$courseid.'"/>'."\n";
+            $serverform .= '<input type="hidden" name="courseid" value="'.$courseid.'"/>'."\n";
         }
         if (ref($emailusername) eq 'HASH') {
             if (ref($emailusername->{$usertype}) eq 'HASH') {
                 foreach my $field (sort(keys(%{$emailusername->{$usertype}}))) {
-                    $output .= '<input type="hidden" name="'.$field.'" value="" />'."\n";
+                    $serverform .= '<input type="hidden" name="'.$field.'" value="" />'."\n";
                 }
-                $output .= '<input type="hidden" name="type" value="" />'."\n";
             }
         }
         if ($captcha eq 'original') {
-            $output .= '
+            $serverform .= '
    <input type="hidden" name="crypt" value="" />
    <input type="hidden" name="code" value="" />
 ';
         } elsif ($captcha eq 'recaptcha') {
-            $output .= '
+            if ($recaptchaversion eq '2') {
+                $serverform .= &Apache::lonhtmlcommon::start_pick_box().
+                               &Apache::lonhtmlcommon::row_title(&mt('Validation').'<b>*</b>',
+                                                                 'LC_pick_box_title',
+                                                                 'LC_oddrow_value')."\n".
+                                                                 $captchaform.
+                               &Apache::lonhtmlcommon::row_closure(1)."\n".
+                               &Apache::lonhtmlcommon::row_title()."\n".
+                               '<br /><input type="button" name="createaccount" value="'.
+                               &mt('Create account').'" onclick="checkpass('."'createaccount','newemail'".')" />'.
+                               &Apache::lonhtmlcommon::row_closure(1)."\n".
+                               &Apache::lonhtmlcommon::end_pick_box();
+                undef($captchaform);
+                undef($showsubmit);
+            } else {
+                $serverform .= '
    <input type="hidden" name="recaptcha_challenge_field" value="" />
    <input type="hidden" name="recaptcha_response_field" value="" />
 ';
+            }
+        }
+        if ($usertype ne '') {
+            $serverform .= '<input type="hidden" name="type" value="'.
+                           &HTML::Entities::encode($usertype,'\'<>"&').'" />'."\n";
+        }
+        if ($usernameset eq 'free') {
+            $serverform .= '<input type="hidden" name="username" value="" />'."\n"; 
         }
-        $output .= <<"ENDSERVERFORM";
+        $serverform .= <<"ENDSERVERFORM";
    <input type="hidden" name="logtoken" value="$logtoken" />
    <input type="hidden" name="serverid" value="$lonhost" />
    <input type="hidden" name="uname" value="" />
@@ -940,24 +1252,33 @@ sub print_dataentry_form {
 ENDSERVERFORM
         my $beginclientform = '<form name="newemail" method="post" action="" '.
                               'onsubmit="return checkpass('."'createaccount','newemail'".');">'."\n";
-        my $endclientform = '<input type="hidden" name="udom" value="'.$domain.'" />'."\n".
-                            '<input type="hidden" name="lextkey" value="'.$lextkey.'" />'."\n".
-                            '<input type="hidden" name="uextkey" value="'.$uextkey.'" />'."\n".
-                            '</form>'."\n".
-                            '<p class="LC_info">'.&mt('Fields marked [_1]*[_2] are required.','<b>','</b>').'</p>';
+        my $endclientform;
+        unless ($showsubmit) {
+            if ($usertype ne '') {
+                $endclientform = '<input type="hidden" name="type" value="'.
+                                 &HTML::Entities::encode($usertype,'\'<>"&').'" />'."\n";
+            }
+        }
+        $endclientform .= '<input type="hidden" name="udom" value="'.$domain.'" />'."\n".
+                          '<input type="hidden" name="lextkey" value="'.$lextkey.'" />'."\n".
+                          '<input type="hidden" name="uextkey" value="'.$uextkey.'" />'."\n".
+                          '</form>'."\n";
         my ($datatable,$rowcount) =
             &Apache::loncreateuser::personal_data_display('',$domain,'email','selfcreate',
-                                                          '','',$now,$captchaform,
-                                                          $emailusername,$usertype);
+                                                          '','','',$now,$captchaform,
+                                                          $emailusername,$usertype,
+                                                          $usernameset,$condition,$excluded,
+                                                          $showsubmit);
         if ($rowcount) {
-            $output .= '<div class="LC_left_float">'.$beginclientform.$datatable.$endclientform;
+            $output .= '<div class="LC_left_float">'.$beginclientform.$datatable.$endclientform.'</div>'."\n".
+                       '<div class="LC_clear_float_footer"></div>'."\n";
         } else {
             $output .= $beginclientform.$endclientform;
         }
-        if ($rowcount) {
-            $output .= '</div>'."\n".
-                       '<div class="LC_clear_float_footer"></div>'."\n";
-        }
+        $output .= $serverform.
+                   '<p class="LC_info">'.
+                   &mt('Fields marked [_1]*[_2] are required.','<b>','</b>').
+                   '</p>';
     } else {
         $output = &mt('Could not load javascript file [_1]','<tt>londes.js</tt>');
     }
@@ -970,14 +1291,15 @@ ENDSERVERFORM
 
 sub get_creation_controls {
     my ($domain,$usercreation) = @_;
-    my (@cancreate,@statustocreate,$emailusername);
+    my (@cancreate,@statustocreate,@statusforemail,$emailusername,$processing,
+        $emailoptions,$verification,$emaildomain,$othertitle,$usertypes,$types);
     if (ref($usercreation) eq 'HASH') {
         if (ref($usercreation->{'cancreate'}) eq 'HASH') {
+            ($othertitle,$usertypes,$types) =
+                &Apache::loncommon::sorted_inst_types($domain);
             if (ref($usercreation->{'cancreate'}{'statustocreate'}) eq 'ARRAY') {
                 @statustocreate = @{$usercreation->{'cancreate'}{'statustocreate'}};
                 if (@statustocreate == 0) {
-                    my ($othertitle,$usertypes,$types) =
-                        &Apache::loncommon::sorted_inst_types($domain);
                     if (ref($types) eq 'ARRAY') {
                         if (@{$types} == 0) {
                             @statustocreate = ('default');
@@ -988,8 +1310,6 @@ sub get_creation_controls {
                 }
             } else {
                 @statustocreate = ('default');
-                my ($othertitle,$usertypes,$types) =
-                    &Apache::loncommon::sorted_inst_types($domain);
                 if (ref($types) eq 'ARRAY') {
                     push(@statustocreate,@{$types});
                 }
@@ -1000,14 +1320,50 @@ sub get_creation_controls {
                      ($usercreation->{'cancreate'}{'selfcreate'} ne '')) {
                 @cancreate = ($usercreation->{'cancreate'}{'selfcreate'});
             }
+            if (grep(/^email$/,@cancreate)) {
+                if (ref($usercreation->{'cancreate'}{'selfcreateprocessing'}) eq 'HASH') {
+                    $processing = $usercreation->{'cancreate'}{'selfcreateprocessing'};
+                }
+                if (ref($usercreation->{'cancreate'}{'emailoptions'}) eq 'HASH') {
+                    $emailoptions = $usercreation->{'cancreate'}{'emailoptions'};
+                }
+                if (ref($usercreation->{'cancreate'}{'emailverified'}) eq 'HASH') {
+                    $verification = $usercreation->{'cancreate'}{'emailverified'};
+                }
+                if (ref($usercreation->{'cancreate'}{'emaildomain'}) eq 'HASH') {
+                    $emaildomain = $usercreation->{'cancreate'}{'emaildomain'};
+                }
+                if (ref($processing)) {
+                    my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
+                    my @emailtypes;
+                    if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') {
+                        @statusforemail = @{$domdefaults{'inststatusguest'}};
+                        unless (@statusforemail) {
+                            my @okcreate;
+                            foreach my $poss (@cancreate) {
+                                unless ($poss eq 'email') {
+                                     push(@okcreate,$poss);
+                                }
+                            }
+                            @cancreate = @okcreate;
+                        }
+                    }
+                }  
+            }
             if (ref($usercreation->{'cancreate'}{'emailusername'}) eq 'HASH') {
                 $emailusername = $usercreation->{'cancreate'}{'emailusername'};
             } else {
-                $emailusername =  {'lastname' => '1', 'firstname' => 1, };
+                $emailusername = {
+                                    default =>  {
+                                                   'lastname' => '1',
+                                                   'firstname' => 1,
+                                                },
+                                 };
             }
         }
     }
-    return (\@cancreate,\@statustocreate,$emailusername);
+    return (\@cancreate,\@statustocreate,\@statusforemail,$emailusername,
+            $emailoptions,$verification,$emaildomain,$types,$usertypes,$othertitle);
 }
 
 sub create_account {
@@ -1020,7 +1376,7 @@ sub create_account {
     my $output;
     if (ref($dataref) eq 'HASH') {
         my ($username,$encpass,$serverid,$courseid,$id,$firstname,$middlename,$lastname,
-            $generation,$inststatus);
+            $generation,$inststatus,$permanentemail);
         $username   = $dataref->{'username'};
         $encpass    = $dataref->{'upass'};
         $serverid   = $dataref->{'serverid'};
@@ -1032,6 +1388,11 @@ sub create_account {
         $generation = $dataref->{'generation'};
         $inststatus = $dataref->{'inststatus'};
 
+        if ($dataref->{'email'} ne '') {
+            $permanentemail = $dataref->{'email'};
+        } else {
+            $permanentemail = $dataref->{'username'};
+        }
         my $currhome = &Apache::lonnet::homeserver($username,$domain);
         unless ($currhome eq 'no_host') {
             $output = &mt('User account requested for username: [_1] in domain: [_2] already exists.',$username,$domain);
@@ -1042,7 +1403,13 @@ sub create_account {
 
         my ($key,$caller)=split(/&/,$dataref->{'tmpinfo'});
         if ($caller eq 'createaccount') {
-            my $upass = &Apache::loncommon::des_decrypt($key,$encpass);
+            my $upass;
+            if ($encpass eq '') {
+                $output = &mt('Password retrieved was blank.');
+                return ('fail',$error.$output.$end.$rtnlink);
+            } else {
+                $upass = &Apache::loncommon::des_decrypt($key,$encpass);
+            }
 
 # See if we are allowed to use the proposed student/employee ID,
 # as per domain rules; if not, student/employee will be left blank.
@@ -1063,7 +1430,7 @@ sub create_account {
             my $result =
                 &Apache::lonnet::modifyuser($domain,$username,$id,
                                             'internal',$upass,$firstname,$middlename,
-                                            $lastname,$generation,undef,undef,$username);
+                                            $lastname,$generation,undef,undef,$permanentemail);
             $output = &mt('Generating user: [_1]',$result);
 
 # Now that the user account exists, retrieve the homeserver, and include it in the output.
@@ -1072,7 +1439,7 @@ sub create_account {
             unless (($inststatus eq 'default') || ($inststatus eq '')) {
                 &Apache::lonnet::put('environment',{inststatus => $inststatus},$domain,$username);
             }
-            $output .= '<br />'.&mt('Home server: [_1]',$uhome).' '.
+            $output .= '<br />'.&mt('Home Server').": $uhome ".
                        &Apache::lonnet::hostname($uhome).'<br /><br />';
             return ('ok',$output,$uhome);
         } else {
@@ -1182,7 +1549,7 @@ sub login_failure_msg {
     } else {
         $url = "/adm/createaccount";
     }
-    my $output = '<h4>'.&mt('Authentication failed').'</h4><div class="LC_warning">'.
+    my $output = '<h3 class="LC_heading_3">'.&mt('Authentication failed').'</h3><div class="LC_warning">'.
                  &mt('Username and/or password could not be authenticated.').
                  '</div>'.
                  &mt('Please check the username and password.').'<br /><br />';
@@ -1230,7 +1597,9 @@ sub username_check {
         $output = '<form method="post" action="/adm/createaccount">';
         if (ref($shibenv) eq 'HASH') {
             foreach my $key (keys(%{$shibenv})) {
-                 $inst_results{$username.':'.$domain}{$key} = $shibenv->{$key};
+                if ($ENV{$shibenv->{$key}} ne '') {
+                    $inst_results{$username.':'.$domain}{$key} = $ENV{$shibenv->{$key}};
+                }
             }
         }
         (my $datatable,$rowcount,$editable) = 
@@ -1243,7 +1612,8 @@ sub username_check {
                     '<input type="hidden" name="udom" value="'.$domain.'" />'."\n".
                     '<input type="hidden" name="phase" value="username_activation" />';
         my $now = time;
-        my %info = ('ip'         => $ENV{'REMOTE_ADDR'},
+        my $ip = &Apache::lonnet::get_requestor_ip();
+        my %info = ('ip'         => $ip,
                     'time'       => $now,
                     'domain'     => $domain,
                     'username'   => $username);
@@ -1258,7 +1628,7 @@ sub username_check {
         }
     }
     if ($checkfail) { 
-        $msg = '<br /><h4>'.&mt('Account creation unavailable').'</h4>';
+        $msg = '<br /><h3 class="LC_heading_3">'.&mt('Account creation unavailable').'</h3>';
         if ($checkfail eq 'username') {
             $msg .= '<span class="LC_warning">'.
                      &mt('A LON-CAPA account may not be created with the username you use.').
@@ -1284,18 +1654,18 @@ sub username_check {
         if ($rowcount) {
             if ($editable) {
                 if ($courseid ne '') { 
-                    $msg = '<br /><h4>'.&mt('User information').'</h4>';
+                    $msg = '<br /><h3 class="LC_heading_3">'.&mt('User information').'</h3>';
                 }
                 $msg .= &mt('To create one, use the table below to provide information about yourself, then click the [_1]Create LON-CAPA account[_2] button.','<span class="LC_cusr_emph">','</span>').'<br />';
             } else {
                  if ($courseid ne '') {
-                     $msg = '<h4>'.&mt('Review user information').'</h4>';
+                     $msg = '<h3 class="LC_heading_3">'.&mt('Review user information').'</h3>';
                  }
                  $msg .= &mt('A user account will be created with information displayed in the table below, when you click the [_1]Create LON-CAPA account[_2] button.','<span class="LC_cusr_emph">','</span>').'<br />';
             }
         } else {
             if ($courseid ne '') {
-                $msg = '<h4>'.&mt('Confirmation').'</h4>';
+                $msg = '<h3 class="LC_heading_3">'.&mt('Confirmation').'</h3>';
             }
             $msg .= &mt('Confirm that you wish to create an account.');
         }
@@ -1436,7 +1806,7 @@ sub check_id {
 
 sub invalid_state {
     my ($error,$domdesc,$contact_name,$contact_email,$msgtext) = @_;
-    my $msg = '<h3>'.&mt('Account creation unavailable').'</h3><span class="LC_error">';
+    my $msg = '<h2 class="LC_heading_2">'.&mt('Account creation unavailable').'</h2><span class="LC_error">';
     if ($error eq 'baduseremail') {
         $msg .= &mt('The e-mail address you provided does not appear to be a valid address.');
     } elsif ($error eq 'badusername') {
@@ -1447,10 +1817,10 @@ sub invalid_state {
         $msg .= &mt('Username rules at this institution do not allow the e-mail address you provided to be used as a username.');
     } elsif ($error eq 'userformat') {
         $msg .= &mt('The e-mail address you provided may not be used as a username at this LON-CAPA institution.');
-    } elsif ($error eq 'captcha') {
-        $msg .= &mt('Validation of the code you entered failed.');
     } elsif ($error eq 'noemails') {
         $msg .= &mt('Creation of a new user account using an e-mail address as username is not permitted at this LON-CAPA institution.');
+    } elsif ($error eq 'emailfail') {
+        $msg .= &mt('Creation of a new user account with verification by e-mail is not permitted with the e-mail address you provided');
     }
     $msg .= '</span>';
     if ($msgtext) {
@@ -1583,11 +1953,15 @@ sub store_request {
 }
 
 sub guest_format_check {
-    my ($useremail,$domain,$cancreate,$settings) = @_;
+    my ($useremail,$domain,$cancreate,$settings,$usertype) = @_;
     my ($login,$format_match,$format_msg,@user_rules);
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{'email_rule'}) eq 'ARRAY') {
             push(@user_rules,@{$settings->{'email_rule'}});
+        } elsif (ref($settings->{'email_rule'}) eq 'HASH') {
+            if (ref($settings->{'email_rule'}->{$usertype}) eq 'ARRAY') {
+                push(@user_rules,@{$settings->{'email_rule'}->{$usertype}});
+            }
         }
     }
     if (@user_rules > 0) {
@@ -1623,14 +1997,14 @@ sub sso_logout_frag {
     if (defined($r->dir_config('lonSSOUserLogoutMessageFile_'.$domain))) {
         my $msgfile = $r->dir_config('lonSSOUserLogoutMessageFile_'.$domain);
         if (-e $msgfile) {
-            open(my $fh,"<$msgfile");
+            open(my $fh,"<",$msgfile);
             $endsessionmsg = join('',<$fh>);
             close($fh);
         }
     } elsif (defined($r->dir_config('lonSSOUserLogoutMessageFile'))) {
         my $msgfile = $r->dir_config('lonSSOUserLogoutMessageFile');
         if (-e $msgfile) {     
-            open(my $fh,"<$msgfile");
+            open(my $fh,"<",$msgfile);
             $endsessionmsg = join('',<$fh>);
             close($fh);
         }
@@ -1691,6 +2065,101 @@ function getFormByName(item) {
 }
 // ]]>
 </script>
+ENDSCRIPT
+
+}
+
+sub setelements_js {
+    my ($statusforemail,$types,$usertypes,$othertitle) = @_;
+    my ($posstypes,$posstypesnames,$availabletypes);
+    if ((ref($statusforemail) eq 'ARRAY') && (ref($types) eq 'ARRAY') && 
+        (ref($usertypes) eq 'HASH')) {
+        $posstypes = join("','",@{$types},'default');
+        $posstypesnames = join("','",(map {$usertypes->{$_};} @{$types}),$othertitle);
+        $availabletypes = join("','", @{$statusforemail});
+    }
+    return  <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+
+function setElements() {
+    if (document.getElementById('LC_reportstatus')) {
+        var reportnum = document.reportstatus.type.length;
+        if ((reportnum != 'undefined') && (typeof(document.reportstatus.type) != 'undefined')) {
+            for (var i=0; i<reportnum; i++) {
+                document.reportstatus.type[i].checked = false;
+            }
+        }
+    }
+}
+
+function checkVerification() {
+    var curr;
+    var cancreate = false;
+    var reportnum = document.reportstatus.type.length;
+    if ((reportnum == 'undefined') && (typeof(document.reportstatus.type) != 'undefined')) {
+        curr = document.reportstatus.type.value; 
+    } else if (document.reportstatus.type.length) {
+        for (var i=0; i<document.reportstatus.type.length; i++) {
+            if (document.reportstatus.type[i].checked) {
+                curr = document.reportstatus.type[i].value;
+                break;
+            }
+        }
+    }
+    var types = Array('$posstypes');
+    var names = Array('$posstypesnames');
+    var available = Array('$availabletypes');
+    if (available.length) {
+        for (var i=0; i<available.length; i++) {
+            if (curr == available[i]) {
+                cancreate = true;   
+                break;
+            }
+        }
+    }
+    if (types.length > 0) {
+        for (var j=0; j<types.length; j++) {
+            if (curr == types[j]) {
+                if (!cancreate) {
+                    alert('Creation of an account via verification by e-mail unavailable for user type: "'+names[j]+'"');
+                    setElements();
+                }
+                break;
+            }
+        }
+    }
+    if (cancreate) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+// ]]>
+</script>
+ENDSCRIPT
+
+}
+
+sub username_js {
+    return  <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+
+function toggleUsernameDisp(caller,divid) {
+    if (document.getElementById(divid)) {
+        if (caller.checked) {
+            if (caller.value == '1') {
+                document.getElementById(divid).style.display = 'none';
+            } else {
+                document.getElementById(divid).style.display = 'inline';
+            }
+        }
+    }
+}
+// ]]>
+</script>
 ENDSCRIPT
 
 }