Index: openacs-4/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v
diff -u -N -r1.41.2.3 -r1.41.2.4
--- openacs-4/packages/acs-subsite/lib/login.tcl	13 Mar 2019 11:15:23 -0000	1.41.2.3
+++ openacs-4/packages/acs-subsite/lib/login.tcl	10 Apr 2019 21:05:36 -0000	1.41.2.4
@@ -79,9 +79,8 @@
     set return_url [ad_pvt_home]
 }
 
-set authority_options [auth::authority::get_authority_options]
 if { $authority_id eq "" } {
-    set authority_id [lindex $authority_options 0 1]
+    set authority_id [auth::authority::get]
 }
 
 set forgotten_pwd_url [auth::password::get_forgotten_url \
@@ -128,6 +127,7 @@
         set focus "email"
     }
 } else {
+    set authority_options [auth::authority::get_authority_options]
     if { [llength $authority_options] > 1 } {
         ad_form -extend -name login -form {
             {authority_id:integer(select)