--- loncom/interface/createaccount.pm	2008/02/29 21:01:36	1.2
+++ loncom/interface/createaccount.pm	2008/07/08 03:00:43	1.10
@@ -3,7 +3,7 @@
 # institutional log-in ID (institutional authentication required - localauth
 #  or kerberos) or an e-mail address.
 #
-# $Id: createaccount.pm,v 1.2 2008/02/29 21:01:36 raeburn Exp $
+# $Id: createaccount.pm,v 1.10 2008/07/08 03:00:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,11 +36,13 @@ use Apache::lonacc;
 use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonlocal;
+use Apache::lonauth;
 use Apache::resetpw;
 use Authen::Captcha;
 use DynaLoader; # for Crypt::DES version
 use Crypt::DES;
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities;
 
 sub handler {
     my $r = shift;
@@ -49,65 +51,180 @@ sub handler {
     if ($r->header_only) {
         return OK;
     }
-    my $domain = &Apache::lonnet::default_login_domain();
+    
+    my $domain;
+
+    my $sso_username = $r->subprocess_env->get('REDIRECT_SSOUserUnknown');
+    my $sso_domain = $r->subprocess_env->get('REDIRECT_SSOUserDomain');
+
+    if ($sso_username ne '' && $sso_domain ne '') {
+        $domain = $sso_domain; 
+    } else { 
+        $domain = &Apache::lonnet::default_login_domain();
+    }
     my $domdesc = &Apache::lonnet::domain($domain,'description');
-    my $start_page =
-        &Apache::loncommon::start_page('Create a user account in LON-CAPA','',
-                                           {
-                                             'no_inline_link'   => 1,});
-    $r->print($start_page);
-    &Apache::lonhtmlcommon::clear_breadcrumbs();
-    &Apache::lonhtmlcommon::add_breadcrumb
-    ({href=>"/adm/createuser",
-      text=>"New username"});
     my $contact_name = &mt('LON-CAPA helpdesk');
     my $contact_email =  $r->dir_config('lonSupportEMail');
     my $lonhost = $r->dir_config('lonHostID');
     my $include = $r->dir_config('lonIncludes');
+    my $start_page;
+
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token','courseid']);
     &Apache::lonacc::get_posted_cgi($r);
     &Apache::lonlocal::get_language_handle($r);
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']);
-    my $token = $env{'form.token'};
-    my $output;
-    my $cancreate;
+
+    my $handle = &Apache::lonnet::check_for_valid_session($r);
+    if ($handle ne '') {
+        $start_page =
+            &Apache::loncommon::start_page('Already logged in');
+        my $end_page =
+            &Apache::loncommon::end_page();
+        $r->print($start_page."\n".'<h2>'.&mt('You are already logged in').'</h2>'.
+                  '<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_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);
+       return OK;
+    }
+    $start_page =
+        &Apache::loncommon::start_page('Create a user account in LON-CAPA','',
+                                       {'no_inline_link'   => 1,});
+    if ($env{'form.phase'} eq 'username_activation') {
+        if ($env{'form.udom'} ne '') {
+            $domain = $env{'form.udom'};
+        }
+    }
+    my @cancreate;
     my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
     if (ref($domconfig{'usercreation'}) eq 'HASH') {
-        if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') { 
-            if ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne 'none') {
-                $cancreate = $domconfig{'usercreation'}{'cancreate'}{'selfcreate'};
+        if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') {
+            if (ref($domconfig{'usercreation'}{'cancreate'}{'selfcreate'}) eq 'ARRAY') {
+                @cancreate = @{$domconfig{'usercreation'}{'cancreate'}{'selfcreate'}};
+            } elsif (($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne 'none') &&
+                     ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne '')) {
+                @cancreate = ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'});
             }
         }
     }
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Create account'));
-    if (!$cancreate) {
-        $output = &mt('Creation of a new user account using an e-mail address as username or a loginID from your institution is not permitted in the domain: [_1] ([_2])',$domain,$domdesc);
-    } elsif ($token) {  
-        $output = &process_mailtoken($r,$token,$contact_name,$contact_email,$domain,
-                                     $domdesc,$lonhost,$include);
-    } elsif ($env{'form.create_with_email'}) {
+
+    if (@cancreate == 0) {
+        &print_header($r,$start_page);
+        my $output = &mt('Creation of a new user account using an e-mail address or an institutional log-in ID as username is not permitted in the domain: [_1] ([_2]).',$domain,$domdesc);
+        $r->print($output);
+        $r->print(&Apache::loncommon::end_page());
+        return OK;
+    }
+
+    my $courseid;
+    if (defined($env{'form.courseid'})) {
+        $courseid = &validate_course($env{'form.courseid'});
+    }
+
+    if ($sso_username ne '') {
+        &print_header($r,$start_page);
+        my ($output,$msg);
+        if (grep(/^sso$/,@cancreate)) {
+            $msg = &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 in this domain.");
+            ($output, my $checkfail) = &username_check($sso_username,$domain,
+                                                       $domdesc,$courseid,
+                                                       $lonhost,$contact_email); 
+            if ($checkfail eq 'username') {
+                $msg .= &mt('A LON-CAPA account may not be created with the username you use.');
+            } elsif ($checkfail eq 'authtoken') {
+                $msg .= &mt('Error creating token.');
+            } else {
+                $msg .= &mt('To create one, use the table below to provide information about yourself (if appropriate), then click the "Create LON-CAPA account" button.');
+            }
+        } else {
+            $msg = &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 in this domain, and you are not permitted to create one.");
+        }
+        $r->print('<h4>'.$msg.'</h4>'.$output);
+        $r->print(&Apache::loncommon::end_page());
+        return OK;
+    }
+
+    my ($output,$nostart,$noend);
+    my $token = $env{'form.token'};
+    if ($token) {
+        ($output,$nostart,$noend) = 
+            &process_mailtoken($r,$token,$contact_name,$contact_email,$domain,
+                               $domdesc,$lonhost,$include,$start_page);
+        if ($nostart) {
+            if ($noend) {
+                return OK;
+            } else {
+                $r->print($output);
+                $r->print(&Apache::loncommon::end_page());
+                return OK;
+            }
+        } else {
+            &print_header($r,$start_page);
+            $r->print($output);
+            $r->print(&Apache::loncommon::end_page());
+            return OK;
+        }
+    }
+
+    if ($env{'form.phase'} eq 'username_activation') {
+        (my $result,$output,$nostart) = 
+            &username_activation($r,$env{'form.uname'},$domain,$domdesc,
+                                 $lonhost,$courseid);
+        if ($result eq 'ok') {
+            if ($nostart) {
+                return OK;
+            }
+        }
+        &print_header($r,$start_page);
+        $r->print($output);
+        $r->print(&Apache::loncommon::end_page());
+        return OK;
+    }
+
+    &print_header($r,$start_page);
+    if ($env{'form.create_with_email'}) {
         $output = &process_email_request($env{'form.useremail'},$domain,$domdesc,
-                                         $contact_name,$contact_email,$cancreate,
-                                         $lonhost,$domconfig{'usercreation'});
+                                         $contact_name,$contact_email,\@cancreate,
+                                         $lonhost,$domconfig{'usercreation'},
+                                         $courseid);
     } elsif ($env{'form.phase'} eq 'username_validation') {
         $output = &username_validation($env{'form.uname'},$domain,$domdesc,
-                                       $contact_name,$contact_email);
-    } elsif ($env{'form.phase'} eq 'username_activation') {
-        (my $result,$output) = &username_activation($env{'form.uname'},
-                                                    $domain,$domdesc);
-    } else {
+                                       $contact_name,$contact_email,$courseid,
+                                       $lonhost);
+    } elsif (!$token) {
         my $now=time;
-        if ($cancreate eq 'any' || $cancreate eq 'login') {
+        if (grep(/^login$/,@cancreate)) {
             my $jsh=Apache::File->new($include."/londes.js");
             $r->print(<$jsh>);
             $r->print(&javascript_setforms($now));
         }
-        $output = &print_username_form($domain,$domdesc,$cancreate,$now,$lonhost); 
+        $output = &print_username_form($domain,$domdesc,\@cancreate,$now,$lonhost,
+                                       $courseid); 
     }
     $r->print($output);
     $r->print(&Apache::loncommon::end_page());
     return OK;
 }
 
+sub print_header {
+    my ($r,$start_page) = @_;
+    $r->print($start_page);
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    &Apache::lonhtmlcommon::add_breadcrumb
+    ({href=>"/adm/createuser",
+      text=>"New username"});
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Create account'));
+    return;
+}
+
+sub validate_course {
+    my ($courseid) = @_;
+    my ($cdom,$cnum) = ($courseid =~ /^($match_domain)_($match_courseid)$/);
+    if (($cdom ne '') && ($cnum ne '')) {
+        if (&Apache::lonnet::is_course($cdom,$cnum)) {
+            return ($courseid);
+        }
+    }
+    return;
+}
+
 sub javascript_setforms {
     my ($now) =  @_;
     my $js = <<ENDSCRIPT;
@@ -134,7 +251,7 @@ ENDSCRIPT
 
 sub javascript_checkpass {
     my ($now) = @_;
-    my $nopass = &mt('You must enter a password');
+    my $nopass = &mt('You must enter a password.');
     my $mismatchpass = &mt('The passwords you entered did not match.').'\\n'.
                        &mt('Please try again.'); 
     my $js = <<"ENDSCRIPT";
@@ -161,71 +278,76 @@ ENDSCRIPT
 }
 
 sub print_username_form {
-    my ($domain,$domdesc,$cancreate,$now,$lonhost) = @_;
+    my ($domain,$domdesc,$cancreate,$now,$lonhost,$courseid) = @_;
     my %lt = &Apache::lonlocal::texthash(
                                          unam => 'username',
                                          udom => 'domain',
                                          uemail => 'Email address in LON-CAPA',
                                          proc => 'Proceed');
     my $output;
-    if ($cancreate eq 'any' || $cancreate eq 'login') {
-        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>'.&mt('Create account with a username provided by your institution').'</h3>';
-            $output .= &mt('If you already have a Log-in ID at your institution, you may be able to use it[_1] for LON-CAPA.','<br />').'&nbsp;'.&mt('Type in your Log-in ID and password to find out.').'<br /><br />';
-            my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
-            my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
-            my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
-                                               $lonhost);
-            $output .= &serverform($logtoken,$lonhost);
-            my $unameform = '<input type="text" name="uname" size="10" value="" />';
-            my $upassform = '<input type="password" name="upass'.$now.'" size="10" />';
-            my $submit_text = &mt('Create LON-CAPA account');
-            $output .= '<form name="client" method="post" />'."\n". 
-                       &Apache::lonhtmlcommon::start_pick_box()."\n".
-                       &Apache::lonhtmlcommon::row_title(&mt('Log-in ID'),
+    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>'.&mt('Create account with a username provided by your institution').'</h3>';
+                $output .= &mt('If you already have a log-in ID at your institution,[_1] you may be able to use it for LON-CAPA.','<br />').'<br /><br />'.&mt('Type in your log-in ID and password to find out.').'<br /><br />';
+                my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
+                my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
+                my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
+                                                   $lonhost);
+                $output .= &serverform($logtoken,$lonhost,undef,$courseid);
+                my $unameform = '<input type="text" name="uname" size="10" value="" />';
+                my $upassform = '<input type="password" name="upass'.$now.'" size="10" />';
+                my $submit_text = &mt('Create LON-CAPA account');
+                $output .= '<form name="client" method="post" action="/adm/createaccount">'."\n". 
+                           &Apache::lonhtmlcommon::start_pick_box()."\n".
+                           &Apache::lonhtmlcommon::row_title(&mt('Log-in ID'),
                                                         'LC_pick_box_title')."\n".
-                       $unameform."\n".
-                       &Apache::lonhtmlcommon::row_closure(1)."\n".
-                       &Apache::lonhtmlcommon::row_title(&mt('Password'),
+                           $unameform."\n".
+                           &Apache::lonhtmlcommon::row_closure(1)."\n".
+                           &Apache::lonhtmlcommon::row_title(&mt('Password'),
                                                         'LC_pick_box_title')."\n".
-                       $upassform."\n".'<br /><br />'."\n".
-                       '<input type="button" name="username_validation" value="'.
-                       $submit_text.'" onclick="javascript:send()" />'."\n". 
-                       &Apache::lonhtmlcommon::row_closure(1)."\n".
-                       &Apache::lonhtmlcommon::end_pick_box().'<br /><br />'."\n".
-                       '<input type="hidden" name="lextkey" value="'.$lextkey.'">'."\n".
-                       '<input type="hidden" name="uextkey" value="'.$uextkey.'">'."\n".
-                       '</form></div>';
-        }
-    }
-    if (($cancreate eq 'any') || ($cancreate eq 'email')) {
-        $output .= '<div class="LC_left_float"><h3>'.&mt('Create account with an e-mail address as your username').'</h3>';
-        if ($cancreate eq 'any') {
-            $output .= &mt('Provide your e-mail address to request a LON-CAPA account if you do not have [_1] a log-in ID at your institution.','<br />').'<br /><br />';
-        } elsif ($cancreate eq 'unofficial') {
-            $output .= '<br />';
-        }
-        my $emailform = '<input type="text" name="useremail" size="25" value="" />';
-        my $captchaform = &create_captcha();
-        my $submit_text = &mt('Request LON-CAPA account');
-        $output .=  '<form name="createaccount" method="post" onsubmit="validate_email();" >'.
-                    &Apache::lonhtmlcommon::start_pick_box()."\n".
-                    &Apache::lonhtmlcommon::row_title(&mt('E-mail address'),
-                                                     'LC_pick_box_title')."\n".
-                    $emailform."\n".
-                    &Apache::lonhtmlcommon::row_closure(1).
-                    &Apache::lonhtmlcommon::row_title(&mt('Validation'),
-                                                     'LC_pick_box_title')."\n".
-                    $captchaform."\n".'<br /><br />'.
-                    '<input type="submit" name="create_with_email" value="'.
-                    $submit_text.'" />'.
-                    &Apache::lonhtmlcommon::row_closure(1).
-                    &Apache::lonhtmlcommon::end_pick_box().'<br /><br /></form>'.
-                    '</div>';
+                           $upassform."\n".'<br /><br />'."\n".
+                           '<input type="button" name="username_validation" value="'.
+                           $submit_text.'" onclick="javascript:send()" />'."\n". 
+                           &Apache::lonhtmlcommon::row_closure(1)."\n".
+                           &Apache::lonhtmlcommon::end_pick_box().'<br /><br />'."\n".
+                           '<input type="hidden" name="lextkey" value="'.$lextkey.'">'."\n".
+                           '<input type="hidden" name="uextkey" value="'.$uextkey.'">'."\n".
+                           '</form></div>';
+            }
+        }
+        if (grep(/^email$/,@{$cancreate})) {
+            $output .= '<div class="LC_left_float"><h3>'.&mt('Create account with an e-mail address as your username').'</h3>';
+            if (grep(/^login$/,@{$cancreate})) {
+                $output .= &mt('Provide your e-mail address to request a LON-CAPA account,[_1] if you do not have a log-in ID at your institution.','<br />').'<br /><br />';
+            } else {
+                $output .= '<br />';
+            }
+            my $emailform = '<input type="text" name="useremail" size="25" value="" />';
+            my $captchaform = &create_captcha();
+            my $submit_text = &mt('Request LON-CAPA account');
+            $output .=  '<form name="createaccount" method="post" onsubmit="validate_email();" action="/adm/createaccount">'.
+                        &Apache::lonhtmlcommon::start_pick_box()."\n".
+                        &Apache::lonhtmlcommon::row_title(&mt('E-mail address'),
+                                                         'LC_pick_box_title')."\n".
+                        $emailform."\n".
+                        &Apache::lonhtmlcommon::row_closure(1).
+                        &Apache::lonhtmlcommon::row_title(&mt('Validation'),
+                                                         'LC_pick_box_title')."\n".
+                        $captchaform."\n".'<br /><br />';
+            if ($courseid ne '') {
+                $output .= '<input type="hidden" name="courseid" value="'.$courseid.'"/>'."\n"; 
+            }
+            $output .= '<input type="submit" name="create_with_email" value="'. 
+                        $submit_text.'" />'.
+                        &Apache::lonhtmlcommon::row_closure(1).
+                        &Apache::lonhtmlcommon::end_pick_box().'<br /><br /></form>'.
+                        '</div>';
+        }
     }
     if ($output eq '') {
-        $output = &mt('Creation of a new user account using either an e-mail address or institutional log-in ID as your username is not permitted in the domain: [_1] ([_2])',$domain,$domdesc);
+        $output = &mt('Creation of a new user account using an e-mail address or an institutional log-in ID as your username is not permitted in the domain: [_1] ([_2])',$domain,$domdesc);
     } else {
         $output .= '<div class="LC_clear_float_footer"></div>';
     }
@@ -234,126 +356,133 @@ sub print_username_form {
 
 sub process_email_request {
     my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate,
-        $server,$settings) = @_;
+        $server,$settings,$courseid) = @_;
     my $useremail = $env{'form.useremail'};
     my $output;
-    if ($cancreate ne 'any' && $cancreate ne 'email') {
-        $output = &invalid_state('noemails',$domdesc,
-                                 $contact_name,$contact_email);
-        return $output;
-    } elsif ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {
-        $output = &invalid_state('baduseremail',$domdesc,
-                                 $contact_name,$contact_email);
-        return $output;
-    } else {
-        my $uhome = &Apache::lonnet::homeserver($useremail,$domain);
-        if ($uhome ne 'no_host') {
-            $output = &invalid_state('existinguser',$domdesc,
+    if (ref($cancreate) eq 'ARRAY') {
+        if (!grep(/^email$/,@{$cancreate})) {
+            $output = &invalid_state('noemails',$domdesc,
+                                     $contact_name,$contact_email);
+            return $output;
+        } elsif ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {
+            $output = &invalid_state('baduseremail',$domdesc,
                                      $contact_name,$contact_email);
             return $output;
         } else {
-            my $code = $env{'form.code'};
-            my $md5sum = $env{'form.crypt'};
-            my %captcha_params = &captcha_settings();
-            my $captcha = Authen::Captcha->new(
-                              output_folder => $captcha_params{'output_dir'},
-                              data_folder   => $captcha_params{'db_dir'},
-                             );
-            my $captcha_chk = $captcha->check_code($code,$md5sum);
-            my %captcha_hash = (
-                              0       => 'Code not checked (file error)',
-                              -1      => 'Failed: code expired',
-                              -2      => 'Failed: invalid code (not in database)',
-                              -3      => 'Failed: invalid code (code does not match crypt)',
-                               );
-            if ($captcha_chk != 1) {
-                $output = &invalid_state('captcha',$domdesc,$contact_name,
-                                         $contact_email,$captcha_hash{$captcha_chk});
+            my $uhome = &Apache::lonnet::homeserver($useremail,$domain);
+            if ($uhome ne 'no_host') {
+                $output = &invalid_state('existinguser',$domdesc,
+                                         $contact_name,$contact_email);
                 return $output;
-            }
-            my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts);
-            my $uhome=&Apache::lonnet::homeserver($useremail,$domain);
-            if ($uhome eq 'no_host') {
-                my $checkhash;
-                my $checks = { 'username' => 1 };
-                $checkhash->{$useremail.':'.$domain} = { 'newuser' => 1, };
-                &Apache::loncommon::user_rule_check($checkhash,$checks,
-                      \%alerts,\%rulematch,\%inst_results,\%curr_rules,
-                      \%got_rules);
-                if (ref($alerts{'useremail'}) eq 'HASH') {
-                    if (ref($alerts{'useremail'}{$domain}) eq 'HASH') {
-                        if ($alerts{'username'}{$domain}{$useremail}) {
-                            $output = &invalid_state('userrules',$domdesc,
-                                                     $contact_name,$contact_email);
-                            return $output;
+            } else {
+                my $code = $env{'form.code'};
+                my $md5sum = $env{'form.crypt'};
+                my %captcha_params = &captcha_settings();
+                my $captcha = Authen::Captcha->new(
+                                  output_folder => $captcha_params{'output_dir'},
+                                  data_folder   => $captcha_params{'db_dir'},
+                                 );
+                my $captcha_chk = $captcha->check_code($code,$md5sum);
+                my %captcha_hash = (
+                                  0       => 'Code not checked (file error)',
+                                  -1      => 'Failed: code expired',
+                                  -2      => 'Failed: invalid code (not in database)',
+                                  -3      => 'Failed: invalid code (code does not match crypt)',
+                                   );
+                if ($captcha_chk != 1) {
+                    $output = &invalid_state('captcha',$domdesc,$contact_name,
+                                             $contact_email,$captcha_hash{$captcha_chk});
+                    return $output;
+                }
+                my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts);
+                my $uhome=&Apache::lonnet::homeserver($useremail,$domain);
+                if ($uhome eq 'no_host') {
+                    my $checkhash;
+                    my $checks = { 'username' => 1 };
+                    $checkhash->{$useremail.':'.$domain} = { 'newuser' => 1, };
+                    &Apache::loncommon::user_rule_check($checkhash,$checks,
+                          \%alerts,\%rulematch,\%inst_results,\%curr_rules,
+                          \%got_rules);
+                    if (ref($alerts{'useremail'}) eq 'HASH') {
+                        if (ref($alerts{'useremail'}{$domain}) eq 'HASH') {
+                            if ($alerts{'username'}{$domain}{$useremail}) {
+                                $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;
+                    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;
+                    }
                 }
             }
         }
+        $output = &send_token($domain,$useremail,$server,$domdesc,$contact_name,
+                          $contact_email,$courseid);
     }
-    $output = &send_token($domain,$useremail,$server,$domdesc,$contact_name,
-                          $contact_email);
     return $output;
 }
 
 sub send_token {
-    my ($domain,$email,$server,$domdesc,$contact_name,$contact_email) = @_;
+    my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid) = @_;
     my $msg = &mt('Thank you for your request to create a new LON-CAPA account.').'<br /><br />';
     my $now = time;
     my %info = ('ip'         => $ENV{'REMOTE_ADDR'},
                 'time'       => $now,
                 'domain'     => $domain,
-                'username'   => $email);
+                'username'   => $email,
+                'courseid'   => $courseid);
     my $token = &Apache::lonnet::tmpput(\%info,$server);
     if ($token !~ /^error/ && $token ne 'no_such_host') {
         my $esc_token = &escape($token);
         my $mailmsg = &mt('A request was submitted on [_1] for creation of a LON-CAPA account in the [_2] domain.',localtime(time),$domdesc).' '.
-             &mt('To complete this process please open a web browser and enter the following ".
-             "URL in the address/location box: ').&Apache::lonnet::absolute_url()."/adm/createaccount?token=$esc_token";
+             &mt('To complete this process please open a web browser and enter the following'
+                .' URL in the address/location box: [_1]'
+                ,&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token);
         my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name,
                                                  $contact_email);
         if ($result eq 'ok') {
             $msg .= &mt('A message has been sent to the e-mail address you provided.').'<br />'.&mt('The message includes the web address for the link you will use to complete the account creation process.').'<br />'.&mt("The link included in the message will be valid for the next [_1]two[_2] hours.",'<b>','</b>');
         } else {
-            $msg .= &mt('An error occurred when sending a message to the e-mail address you provided. Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
+            $msg .= &mt('An error occurred when sending a message to the e-mail address you provided.')
+                   .' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
         }
     } else {
-        $msg .= &mt('An error occurred creating a token required for the account creation process. Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
+        $msg .= &mt('An error occurred creating a token required for the account creation process.')
+               .' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
     }
     return $msg;
 }
 
 sub process_mailtoken {
-    my ($r,$token,$contact_name,$contact_email,$domain,$domdesc,$lonhost,$include) = @_;
-    my $msg;
+    my ($r,$token,$contact_name,$contact_email,$domain,$domdesc,$lonhost,
+        $include,$start_page) = @_;
+    my ($msg,$nostart,$noend);
     my %data = &Apache::lonnet::tmpget($token);
     my $now = time;
     if (keys(%data) == 0) {
-        $msg = &mt('Sorry, the URL you provided to complete creation of a new LON-CAPA account was invalid.  Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a <a href="/adm/createaccount">new request</a> for account creation and follow the link to the new URL included in the e-mail that will be sent to you.');
+        $msg = &mt('Sorry, the URL you provided to complete creation of a new LON-CAPA account was invalid.')
+               .' '.&mt('Either the token included in the URL has been deleted or the URL you provided was invalid.')
+               .' '.&mt('Please submit a [_1]new request[_2] for account creation and follow the new link page included in the e-mail that will be sent to you.','<a href="/adm/createaccount">','</a>');
         return $msg;
     }
     if (($data{'time'} =~ /^\d+$/) &&
         ($data{'domain'} ne '') &&
         ($data{'username'}  =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/)) {
-        my $reqtime = localtime($data{'time'});
         if ($now - $data{'time'} < 7200) {
             if ($env{'form.phase'} eq 'createaccount') {
-                my ($result,$output) = &create_account($r,$domain,$lonhost,$token,
+                my ($result,$output) = &create_account($r,$domain,$lonhost,
                                                        $data{'username'},$domdesc);
                 if ($result eq 'ok') {
                     $msg = $output; 
-                    my $delete = &Apache::lonnet::tmpdel($token);
-                    my $now = localtime(time);
-                    my $mailmsg = &mt('A LON-CAPA account in the [_1] domain has been created [_2] from IP address: [_3].  If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$domdesc,$now,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
+                    my $shownow = localtime($now);
+                    my $mailmsg = &mt('A LON-CAPA account in the [_1] domain 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 $mailresult = &Apache::resetpw::send_mail($domdesc,$data{'email'},
                                                                  $mailmsg,$contact_name,
                                                                  $contact_email);
@@ -362,33 +491,71 @@ sub process_mailtoken {
                     } else {
                         $msg .= &mt('An error occurred when sending e-mail to [_1] confirming creation of your LON-CAPA account.',$data{'username'});
                     }
-                    $msg .= '<br /><br />'.&mt('<a href="/adm/login">Go to the login page</a>.');
+                    my %form = &start_session($r,$data{'username'},$domain, 
+                                              $lonhost,$data{'courseid'},
+                                              $token);
+                    $nostart = 1;
+                    $noend = 1;
                 } else {
-                    $msg .= &mt('A problem occurred when attempting to create your new LON-CAPA account').'<br />'.$output.&mt('Please contact the [_1] - (<a href="mailto:[_2]">[_2]</a>) for assistance.',$contact_name,$contact_email);
+                    $msg .= &mt('A problem occurred when attempting to create your new LON-CAPA account.')
+                           .'<br />'.$output
+#                           .&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,'<a href="mailto:'.$contact_email.'">'.$contact_email.'</a>');
+                           .&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
                 }
+                my $delete = &Apache::lonnet::tmpdel($token);
             } else {
-                $r->print(&mt('Please provide user information and a password for your new account.').'<br />'.&mt('Your password, which must contain at least seven characters, will be sent to the LON-CAPA server in an encrypted form.').'<br />');
-                &print_dataentry_form($r,$domain,$lonhost,$include,$token,$now,$data{'username'});
-
+                $msg .= &mt('Please provide user information and a password for your new account.').'<br />'.&mt('Your password, which must contain at least seven characters, will be sent to the LON-CAPA server in an encrypted form.').'<br />';
+                $msg .= &print_dataentry_form($r,$domain,$lonhost,$include,$token,$now,$data{'username'},$start_page);
+                $nostart = 1;
             }
         } else {
-            $msg = &mt('Sorry, the token generated when you requested creation of an account has expired. Please submit a <a href="/adm/createaccount">new request</a>, and follow the link to the web page included in the new e-mail that will be sent to you, to allow you to create the account.');
+            $msg = &mt('Sorry, the token generated when you requested creation of an account has expired.')
+                  .' '.&mt('Please submit a [_1]new request[_2] for account creation and follow the new link included in the e-mail that will be sent to you.','<a href="/adm/createaccount">','</a>');
+            }
+    } else {
+        $msg .= &mt('Sorry, the URL generated when you requested creation of an account contained incomplete information.')
+               .' '.&mt('Please submit a [_1]new request[_2] for account creation and follow the new link included in the e-mail that will be sent to you.','<a href="/adm/createaccount">','</a>');
+    }
+    return ($msg,$nostart,$noend);
+}
+
+sub start_session {
+    my ($r,$username,$domain,$lonhost,$courseid,$token) = @_;
+    my %form = (
+                uname => $username,
+                udom  => $domain,
+               );
+    my $firsturl = '/adm/roles';
+    if (defined($courseid)) {
+        $courseid = &validate_course($courseid);
+        if ($courseid ne '') {
+            $form{'courseid'} = $courseid;
+            $firsturl = '/adm/selfenroll?cid='.$courseid;
         }
+    }
+    if ($r->dir_config('lonBalancer') eq 'yes') {
+        &Apache::lonauth::success($r,$form{'uname'},$form{'udom'},
+                                  $lonhost,'noredirect',undef,\%form);
+        my $delete = &Apache::lonnet::tmpdel($token);
+        $r->internal_redirect('/adm/switchserver');
     } else {
-        $msg .= &mt('Sorry, the URL generated when you requested creation of an accountcontained incomplete information. Please submit a <a href="/adm/createaccount">new request</a> for creation of an account, and use the new URL that will be sent to your e-mail address to complete the process.');
+        &Apache::lonauth::success($r,$form{'uname'},$form{'udom'},
+                                  $lonhost,$firsturl,undef,\%form);
     }
-    return $msg;
+    return %form;
 }
 
+
 sub print_dataentry_form {
-    my ($r,$domain,$lonhost,$include,$mailtoken,$now,$username) = @_;
+    my ($r,$domain,$lonhost,$include,$mailtoken,$now,$username,$start_page) = @_;
     my ($error,$output);
+    &print_header($r,$start_page);
     if (open(my $jsh,"<$include/londes.js")) {
         while(my $line = <$jsh>) {
             $r->print($line);
         }
         close($jsh);
-        $r->print(&javascript_setforms($now)."\n".&javascript_checkpass($now));
+        $output .= &javascript_setforms($now)."\n".&javascript_checkpass($now);
         my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
         my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
         my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
@@ -413,8 +580,8 @@ sub print_dataentry_form {
                            id             => '15',
                           );
         my $genhelp=&Apache::loncommon::help_open_topic('Generation');
-        $output = '<div class="LC_left_float"><h3>'.$lt{'pd'}.'</h3>'.
-                  '<form name="server" method="post" target="_top">'.
+        $output .= '<div class="LC_left_float"><h3>'.$lt{'pd'}.'</h3>'.
+                  '<form name="server" method="post" target="_top" action="/adm/createaccount">'.
                   &Apache::lonhtmlcommon::start_pick_box();
         foreach my $item (@userinfo) {
             my $rowtitle = $lt{$item};
@@ -466,20 +633,18 @@ ENDSERVERFORM
                    '<form name="buttonform">'."\n".
                    '<input type="button" name="createaccount" value="'.
                    $submit_text.'" onclick="javascript:checkpass();" /></form></div>';
-        $r->print($output);
     } else {
-        $error = &mt('Could not load javascript file [_1]','londes.js');
-        $r->print($error);
+        $output = &mt('Could not load javascript file [_1]','<tt>londes.js</tt>');
     }
-    return;
+    return $output;
 }
 
 sub create_account {
-    my ($r,$domain,$lonhost,$logtoken,$username,$domdesc) = @_;
+    my ($r,$domain,$lonhost,$username,$domdesc) = @_;
     my ($retrieved,$output,$upass) = &process_credentials($env{'form.logtoken'},
                                                           $env{'form.serverid'}); 
     # Error messages
-    my $error     = '<span class="LC_error">'.&mt('Error').': ';
+    my $error     = '<span class="LC_error">'.&mt('Error:').' ';
     my $end       = '</span><br /><br />';
     my $rtnlink   = '<a href="javascript:history.back();" />'.
                     &mt('Return to previous page').'</a>'.
@@ -502,15 +667,15 @@ sub create_account {
                                     'internal',$upass,$env{'form.cfirstname'},
                                     $env{'form.cmiddlename'},$env{'form.clastname'},
                                     $env{'form.cgeneration'},undef,undef,$username);
-    $output = &mt('Generating user').': '.$result;
+    $output = &mt('Generating user: [_1]',$result);
     my $uhome = &Apache::lonnet::homeserver($username,$domain);
-    $output .= '<br />'.&mt('Home server').': '.$uhome.' '.
+    $output .= '<br />'.&mt('Home server: [_1]',$uhome).' '.
               &Apache::lonnet::hostname($uhome).'<br /><br />';
     return ('ok',$output);
 }
 
 sub username_validation {
-    my ($username,$domain,$domdesc,$contact_name,$contact_email) = @_;
+    my ($username,$domain,$domdesc,$contact_name,$contact_email,$courseid,$lonhost) = @_;
     my ($retrieved,$output,$upass);
 
     $username= &LONCAPA::clean_username($username);
@@ -536,55 +701,106 @@ sub username_validation {
             $authok = 'non_authorized';
         }
         if ($authok eq 'authorized') {
-            my (%rulematch,%inst_results,$newuser,%alerts,%curr_rules,%got_rules);
-            $newuser = 1;
-            my $checkhash;
-            my $checks = { 'username' => 1 };
-            $checkhash->{$username.':'.$domain} = { 'newuser' => $newuser };
-            &Apache::loncommon::user_rule_check($checkhash,$checks,
-                \%alerts,\%rulematch,\%inst_results,\%curr_rules,\%got_rules);
-            if (ref($alerts{'username'}) eq 'HASH') {
-                if (ref($alerts{'username'}{$domain}) eq 'HASH') {
-                    if ($alerts{'username'}{$domain}{$username}) {
-                        my $userchkmsg;
-                        if (ref($curr_rules{$domain}) eq 'HASH') {
-                            $userchkmsg =
-                                &Apache::loncommon::instrule_disallow_msg('username',
-                                                                          $domdesc,1).
-                            &Apache::loncommon::user_rule_formats($domain,
-                                $domdesc,$curr_rules{$domain}{'username'},
-                                'username');
-                        }
-                        return $userchkmsg; 
+            ($output,undef) = &username_check($username,$domain,$domdesc,
+                                              $courseid,$lonhost,$contact_email); 
+        } else {
+            $output = '<div class="LC_warning">'
+                     .&mt('Username and/or password could not be authenticated.')
+                     .'</div>'
+                     .&mt('Please check the username and password.'); 
+        }
+    }
+    return $output;
+}
+
+sub username_check {
+    my ($username,$domain,$domdesc,$courseid,$lonhost,$contact_email) = @_;
+    my (%rulematch,%inst_results,$newuser,%alerts,%curr_rules,%got_rules);
+    $newuser = 1;
+    my $checkhash;
+    my $checks = { 'username' => 1 };
+    $checkhash->{$username.':'.$domain} = { 'newuser' => $newuser };
+    &Apache::loncommon::user_rule_check($checkhash,$checks,\%alerts,\%rulematch,
+                                        \%inst_results,\%curr_rules,\%got_rules);
+    if (ref($alerts{'username'}) eq 'HASH') {
+        if (ref($alerts{'username'}{$domain}) eq 'HASH') {
+            if ($alerts{'username'}{$domain}{$username}) {
+                my ($userchkmsg,$checkfail);
+                if (ref($curr_rules{$domain}) eq 'HASH') {
+                    $userchkmsg =
+                        &Apache::loncommon::instrule_disallow_msg('username',$domdesc,1).
+                        &Apache::loncommon::user_rule_formats($domain,$domdesc,
+                                $curr_rules{$domain}{'username'},'username');
+                    if ($userchkmsg) {
+                        $checkfail = 'username';
                     }
                 }
+                return ($userchkmsg,$checkfail);
             }
-            my $submit_text = &mt('Create LON-CAPA account');
-            $output =
-                '<form method="post">'.
-                &Apache::loncreateuser::personal_data_display($username,$domain,1,
-                                       undef,$inst_results{$username.':'.$domain}).
-                '<br /><br /><input type="hidden" name="uname" value="'.$username.'" />'.
-                '<input type="hidden" name="phase" value="username_activation" />'.
-                '<input type="submit" name="newaccount" value="'.
-                $submit_text.'" /></form>';
-        } else {
-            $output = &mt('Not authenticated').' '.&mt('Please check the username and password'); 
         }
     }
-    return $output;
+    my $submit_text = &mt('Create LON-CAPA account');
+    my $output = '<form method="post" action="/adm/createaccount">'.
+                 &Apache::loncreateuser::personal_data_display($username,$domain,1,
+                                    undef,$inst_results{$username.':'.$domain}).
+                '<br /><br /><input type="hidden" name="uname" value="'.$username.'" />'."\n".
+                '<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'},
+                'time'       => $now,
+                'domain'     => $domain,
+                'username'   => $username);
+    my $authtoken = &Apache::lonnet::tmpput(\%info,$lonhost);
+    if ($authtoken !~ /^error/ && $authtoken ne 'no_such_host') {
+        $output .= '<input type="hidden" name="authtoken" value="'.&HTML::Entities::encode($authtoken,'&<>"').'" />';
+    } else {
+        $output = &mt('An error occurred when storing a token').'<br />'.
+                  &mt('You will not be able to proceed to the next stage of account creation').
+                  &linkto_email_help($contact_email,$domdesc);
+        return($output,'authtoken');
+    }
+    if ($courseid ne '') {
+        $output .= '<input type="hidden" name="courseid" value="'.$courseid.'" />';
+    }
+    $output .= '<input type="submit" name="newaccount" value="'.
+               $submit_text.'" /></form>';
+    return ($output,'');
 }
 
 sub username_activation {
-    my ($username,$domain,$domdesc) = @_;
+    my ($r,$username,$domain,$domdesc,$lonhost,$courseid) = @_;
     my $output;
-    my $error     = '<span class="LC_error">'.&mt('Error').': ';
+    my $error     = '<span class="LC_error">'.&mt('Error:').' ';
     my $end       = '</span><br /><br />';
     my $rtnlink   = '<a href="javascript:history.back();" />'.
                     &mt('Return to previous page').'</a>'.
                     &Apache::loncommon::end_page();
     my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
-    if ((($domdefaults{'auth_def'} =~/^krb(4|5)$/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth')) {
+    my %data = &Apache::lonnet::tmpget($env{'form.authtoken'});
+    my $now = time;
+    my $earlyout;
+    my $timeout = 300;
+    if (keys(%data) == 0) {
+        $output = &mt('Sorry, your authentication has expired.');
+        $earlyout = 'fail';
+    }
+    if (($data{'time'} !~ /^\d+$/) ||
+        ($data{'domain'} ne $domain) || 
+        ($data{'username'} ne $username)) {
+        $earlyout = 'fail';
+        $output = &mt('The credentials you provided could not be verified.');   
+    } elsif ($now - $data{'time'} > $timeout) {
+        $earlyout = 'fail';
+        $output = &mt('Sorry, your authentication has expired.');
+    }
+    if ($earlyout ne '') {
+        $output .= '<br />'.&mt('Please [_1]start again[_2].','<a href="/adm/createaccount">','</a>');
+        return($earlyout,$output);
+    }
+    if ((($domdefaults{'auth_def'} =~/^krb(4|5)$/) && 
+         ($domdefaults{'auth_arg_def'} ne '')) || 
+        ($domdefaults{'auth_def'} eq 'localauth')) {
         if ($env{'form.cid'} ne '') {
             my ($result,$userchkmsg) = &check_id($username,$domain,$domdesc);
             if ($result eq 'fail') {
@@ -601,13 +817,18 @@ sub username_activation {
                           $env{'form.cmiddlename'},$env{'form.clastname'},
                           $env{'form.cgeneration'},undef,undef,
                           $env{'form.cpermanentemail'});
-        $output = &mt('Generating user').': '.$result;
-        my $uhome = &Apache::lonnet::homeserver($username,$domain);
-        $output .= '<br />'.&mt('Home server').': '.$uhome.' '.
-                   &Apache::lonnet::hostname($uhome).'<br /><br />';
-        return ('ok',$output);
+        if ($result eq 'ok') {
+            my $delete = &Apache::lonnet::tmpdel($env{'form.authtoken'});
+            $output = &mt('A LON-CAPA account has been created for username: [_1] in domain: [_2].',$username,$domain);
+            my %form = &start_session($r,$username,$domain,$lonhost,$courseid);
+            my $nostart = 1;
+            return ('ok',$output,$nostart);
+        } else {
+            $output = &mt('Account creation failed for username: [_1] in domain: [_2].',$username,$domain).'<br /><span class="LC_error">'.&mt('Error: [_1]',$result).'</span>';
+            return ('fail',$output);
+        }
     } else {
-        $output = &mt("User account creation is not available for the current default authentication type.\n");
+        $output = &mt('User account creation is not available for the current default authentication type.')."\n";
         return('fail',$output);
     }
 }
@@ -660,11 +881,18 @@ sub invalid_state {
     if ($msgtext) {
         $msg .= '<br />'.$msgtext;
     }
+    $msg .= &linkto_email_help($contact_email,$domdesc);
+    return $msg;
+}
+
+sub linkto_email_help {
+    my ($contact_email,$domdesc) = @_;
+    my $msg;
     if ($contact_email ne '') {
         my $escuri = &HTML::Entities::encode('/adm/createaccount','&<>"');
-        $msg .= '<br />'.&mt(' You may wish to contact the <a href="/adm/helpdesk?origurl=[_1]">LON-CAPA helpdesk</a> for the [_2] domain.',$escuri,$domdesc);
+        $msg .= '<br />'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for the [_3] domain.','<a href="/adm/helpdesk?origurl='.$escuri.'">','</a>',$domdesc);
     } else {
-        $msg .= '<br />'.&mt(' You may wish to send an e-mail to the server administrator: [_1] for the [_2] domain.',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc);
+        $msg .= '<br />'.&mt('You may wish to send an e-mail to the server administrator: [_1] for the [_2] domain.',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc);
     }
     return $msg;
 }
@@ -705,7 +933,7 @@ sub getkeys {
 }
 
 sub serverform {
-    my ($logtoken,$lonhost,$mailtoken) = @_;
+    my ($logtoken,$lonhost,$mailtoken,$courseid) = @_;
     my $output .= <<ENDSERVERFORM;
   <form name="server" method="post" target="_top">
    <input type="hidden" name="logtoken" value="$logtoken" />
@@ -714,6 +942,7 @@ sub serverform {
    <input type="hidden" name="uname" value="" />
    <input type="hidden" name="upass" value="" />
    <input type="hidden" name="phase" value="username_validation" />
+   <input type="hidden" name="courseid" value="$courseid" />
   </form>
 ENDSERVERFORM
     return $output;
@@ -724,7 +953,8 @@ sub process_credentials {
     my $tmpinfo=Apache::lonnet::reply('tmpget:'.$logtoken,$lonhost);
     my ($retrieved,$output,$upass);
     if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {
-        $output = &mt('Information needed to retrieve your log-in information is missing, inaccessible or expired.').'<br />'.&mt('You may need to reload the previous page to obtain a new token.');
+        $output = &mt('Information needed to verify your login information is missing, inaccessible or expired.')
+                 .'<br />'.&mt('You may need to reload the previous page to obtain a new token.');
         return ($retrieved,$output,$upass); 
     } else {
         my $reply = &Apache::lonnet::reply('tmpdel:'.$logtoken,$lonhost);
@@ -767,8 +997,10 @@ sub guest_format_check {
     if ($format_match) {
         ($login) = ($useremail =~ /^([^\@]+)\@/);
         $format_msg = '<br />'.&mt("Your e-mail address uses the same internet domain as your institution's LON-CAPA service.").'<br />'.&mt('Creation of a LON-CAPA account with this type of e-mail address as username is not permitted.').'<br />';
-        if ($cancreate eq 'any' || $cancreate eq 'login') {
-            $format_msg .= &mt('You should request creation of a LON-CAPA account for a Log-in ID of "[_1]" at your institution instead.',$login).'<br />'; 
+        if (ref($cancreate) eq 'ARRAY') {
+            if (grep(/^login$/,@{$cancreate})) {
+                $format_msg .= &mt('You should request creation of a LON-CAPA account for a log-in ID of "[_1]" at your institution instead.',$login).'<br />'; 
+            }
         }
     }
     return $format_msg;