--- loncom/interface/createaccount.pm	2014/02/19 17:20:32	1.59
+++ loncom/interface/createaccount.pm	2014/02/20 01:00:33	1.60
@@ -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.59 2014/02/19 17:20:32 raeburn Exp $
+# $Id: createaccount.pm,v 1.60 2014/02/20 01:00:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -348,9 +348,6 @@ sub javascript_setforms {
                 client = document.forms[two];
                 server.elements.uname.value = client.elements.uname.value;
                 server.elements.udom.value = client.elements.udom.value;
-                if (context == 'email') {
-                    $setuserinfo
-                }
 
                 uextkey=client.elements.uextkey.value;
                 lextkey=client.elements.lextkey.value;
@@ -361,7 +358,10 @@ sub javascript_setforms {
 
                 client.elements.uname.value='';
                 client.elements.upass$now.value='';
-                client.elements.upasscheck$now.value='';
+                if (context == 'email') {
+                    $setuserinfo
+                    client.elements.upasscheck$now.value='';
+                }
                 server.submit();
             }
         }