--- loncom/interface/loncreateuser.pm	2015/06/09 21:22:56	1.405
+++ loncom/interface/loncreateuser.pm	2016/02/19 02:39:07	1.409
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.405 2015/06/09 21:22:56 damieng Exp $
+# $Id: loncreateuser.pm,v 1.409 2016/02/19 02:39:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2164,7 +2164,7 @@ sub modify_login_block {
 
 sub personal_data_display {
     my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,
-        $now,$captchaform,$emailusername,$usertype) = @_;
+        $now,$captchaform,$emailusername,$usertype,$recaptchaversion) = @_;
     my ($output,%userenv,%canmodify,%canmodify_status);
     my @userinfo = ('firstname','middlename','lastname','generation',
                     'permanentemail','id');
@@ -2244,8 +2244,8 @@ sub personal_data_display {
                    '<input type="text" name="uname" size="25" value="" autocomplete="off" />';
         $rowcount ++;
         $output .= &Apache::lonhtmlcommon::row_closure(1);
-        my $upassone = '<input type="password" name="upass'.$now.'" size="10" autocomplete="off" />';
-        my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="10" autocomplete="off" />';
+        my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="off" />';
+        my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="20" autocomplete="off" />';
         $output .= &Apache::lonhtmlcommon::row_title(&mt('Password').'<b>*</b>',
                                                     'LC_pick_box_title',
                                                     'LC_oddrow_value')."\n".
@@ -2352,8 +2352,11 @@ sub personal_data_display {
     if (($context eq 'selfcreate') && ($newuser eq 'email')) {
         if ($captchaform) {
             $output .= &Apache::lonhtmlcommon::row_title($lt{'valid'},
-                                                         'LC_pick_box_title')."\n".
-                       $captchaform."\n".'<br /><br />'.
+                                                         'LC_pick_box_title')."\n";
+            if ($recaptchaversion >=2) {
+                $output .= '<script src="https://www.google.com/recaptcha/api.js"></script>'."\n";
+            }
+            $output .= $captchaform."\n".'<br /><br />'.
                        &Apache::lonhtmlcommon::row_closure(1); 
             $rowcount ++;
         }
@@ -3110,7 +3113,7 @@ sub update_user_data {
                                   \%newsettingstext);
                 if ($env{'form.cid'} ne $userenv{'id'}) {
                     &Apache::lonnet::idput($env{'form.ccdomain'},
-                         ($env{'form.ccuname'} => $env{'form.cid'}));
+                         {$env{'form.ccuname'} => $env{'form.cid'}},$uhome,'ids');
                     if (($recurseid) &&
                         (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {
                         my $idresult = 
@@ -5746,6 +5749,12 @@ ENDSCRIPT
         $cathash = $domconfig{'coursecategories'}{'cats'};
         $cattype{'auth'} = $domconfig{'coursecategories'}{'auth'};
         $cattype{'unauth'} = $domconfig{'coursecategories'}{'unauth'};
+        if ($cattype{'auth'} eq '') {
+            $cattype{'auth'} = 'std';
+        }
+        if ($cattype{'unauth'} eq '') {
+            $cattype{'unauth'} = 'std';
+        }
     } else {
         $cathash = {};
         $cattype{'auth'} = 'std';