Index: openacs-4/packages/acs-subsite/lib/email-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/email-confirm.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/acs-subsite/lib/email-confirm.tcl	14 Mar 2019 16:06:11 -0000	1.2.2.1
+++ openacs-4/packages/acs-subsite/lib/email-confirm.tcl	14 Mar 2019 16:10:17 -0000	1.2.2.2
@@ -6,17 +6,16 @@
     token:word,notnull
 }
 
-if {![db_0or1row userp {select 1 from users where user_id = :user_id}]
+set user [acs_user::get_user_info -user_id $user_id]
+if {$user eq ""
     || $token ne [auth::get_user_secret_token -user_id $user_id] } {
     set title "Bad token"
     set message "The link given to authenticate your email was invalid."
     ad_return_template /packages/acs-subsite/lib/message
 } else {
     auth::set_email_verified -user_id $user_id
 
-    acs_user::get -user_id $user_id -array user_info
-
-    set export_vars [export_vars -form { { username $user_info(username) } }]
+    set export_vars [export_vars -form { { username "[dict get $user username]" } }]
     set site_link [ad_site_home_link]
     set system_name [ad_system_name]
 }