Index: openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/acs-subsite/lib/login.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/acs-subsite/lib/login.tcl	7 Aug 2017 23:48:13 -0000	1.2
+++ openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/acs-subsite/lib/login.tcl	28 Jun 2018 08:34:45 -0000	1.3
@@ -40,13 +40,15 @@
                                     -package_id $subsite_id \
                                     -default 1]
 
-if { $email eq "" && $username eq "" && [ad_conn untrusted_user_id] != 0 } {
-    acs_user::get -user_id [ad_conn untrusted_user_id] -array untrusted_user
+set untrusted_user_id [ad_conn untrusted_user_id]
+
+if { $email eq "" && $username eq "" && $untrusted_user_id != 0 } {
     if { [auth::UseEmailForLoginP] } {
-        set email $untrusted_user(email)
+        set email [party::get -party_id $untrusted_user_id -element email]
     } else {
-        set authority_id $untrusted_user(authority_id)
-        set username $untrusted_user(username)
+        set user_info    [acs_user::get_user_info -user_id $untrusted_user_id]
+        set authority_id [dict get $user_info authority_id]
+        set username     [dict get $user_info username]
     }
 }