--- loncom/interface/createaccount.pm	2017/08/03 16:22:08	1.74
+++ loncom/interface/createaccount.pm	2017/08/03 20:06:21	1.75
@@ -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.74 2017/08/03 16:22:08 raeburn Exp $
+# $Id: createaccount.pm,v 1.75 2017/08/03 20:06:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -634,7 +634,7 @@ sub print_username_form {
                     push(@posstypes,'default');
                 }
                 $output .= '<p>'.&mt('Choose your affiliation at [_1]',$domdesc).'</p>'."\n".
-                           '<form name="reportstatus" id="LC_reportstatus" action="" method="post" '.
+                           '<form name="reportstatus" id="LC_reportstatus" action="/adm/createaccount" method="post" '.
                            'onsubmit="return checkVerification();"><p>';
                 foreach my $type (@posstypes) {
                     my $name;
@@ -648,7 +648,11 @@ sub print_username_form {
                             }
                         }
                     }
-                    $output .= '<label><input type="radio" name="type" value="'.$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$/) {
@@ -687,6 +691,18 @@ sub print_username_form {
                     }
                     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,
@@ -1996,6 +2012,7 @@ function checkVerification() {
             if (curr == types[j]) {
                 if (!cancreate) {
                     alert('Creation of an account via verification by e-mail unavailable for user type: "'+names[j]+'"');
+                    setElements();
                 }
                 break;
             }