--- loncom/auth/lonlogin.pm	2015/06/06 14:08:58	1.163
+++ loncom/auth/lonlogin.pm	2016/05/03 22:27:14	1.167
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.163 2015/06/06 14:08:58 raeburn Exp $
+# $Id: lonlogin.pm,v 1.167 2016/05/03 22:27:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -352,18 +352,12 @@ uextkey=this.document.client.elements.ue
 lextkey=this.document.client.elements.lextkey.value;
 initkeys();
 
-this.document.server.elements.upass0.value
-    =this.document.client.elements.upass$now.value.substr(0,15);
-this.document.server.elements.upass1.value
-    =this.document.client.elements.upass$now.value.substr(15,15);
-this.document.server.elements.upass2.value
-    =this.document.client.elements.upass$now.value.substr(30,15);
-
 if(this.document.server.action.substr(0,5) === 'http:'){
-    for (var idx in [1,2,3]){
-        this.document.server.elements['upass' + idx].value = 
-            crypted(this.document.server.elements['upass' + idx].value);
-    }
+    this.document.server.elements.upass0.value
+        =getCrypted(this.document.client.elements.upass$now.value);
+} else {
+    this.document.server.elements.upass0.value
+        =this.document.client.elements.upass$now.value;
 }
 
 this.document.client.elements.uname.value='';
@@ -395,9 +389,9 @@ ENDSCRIPT
 	       alink        => "$alink",
                onload       => 'javascript:enableInput();',);
 
-    my ($lonhost_in_use,$headextra);
-    my @hosts = &Apache::lonnet::current_machine_ids();
-    my $lonhost_in_use = $lonhost;
+    my ($lonhost_in_use,$headextra,$headextra_exempt,@hosts,%defaultdomconf);
+    @hosts = &Apache::lonnet::current_machine_ids();
+    $lonhost_in_use = $lonhost;
     if (@hosts > 1) {
         foreach my $hostid (@hosts) {
             if (&Apache::lonnet::host_domain($hostid) eq $defdom) {
@@ -406,9 +400,9 @@ ENDSCRIPT
             }
         }
     }
-    my %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
-    my $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost_in_use};
-    my $headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost_in_use};
+    %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
+    $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost_in_use};
+    $headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost_in_use};
     if ($headextra) {
         my $omitextra;
         if ($headextra_exempt ne '') {
@@ -479,8 +473,6 @@ ENDSCRIPT
    <input type="hidden" name="serverid" value="$lonhost" />
    <input type="hidden" name="uname" value="" />
    <input type="hidden" name="upass0" value="" />
-   <input type="hidden" name="upass1" value="" />
-   <input type="hidden" name="upass2" value="" />
    <input type="hidden" name="udom" value="" />
    <input type="hidden" name="localpath" value="$env{'form.localpath'}" />
    <input type="hidden" name="localres" value="$env{'form.localres'}" />