Index: openacs-4/packages/acs-authentication/tcl/local-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/local-procs.tcl,v
diff -u -N -r1.46 -r1.47
--- openacs-4/packages/acs-authentication/tcl/local-procs.tcl	11 Jul 2018 10:37:40 -0000	1.46
+++ openacs-4/packages/acs-authentication/tcl/local-procs.tcl	4 Oct 2018 09:14:26 -0000	1.47
@@ -489,15 +489,20 @@
     # LARS TODO: Move this out of the local driver and into the auth framework
     # Generate random password?
     set generated_pwd_p 0
-    if { $password eq "" || [parameter::get -package_id [ad_conn subsite_id] -parameter RegistrationProvidesRandomPasswordP -default 0] } {
+    if { $password eq ""
+         || [parameter::get \
+                 -package_id [ad_conn subsite_id] \
+                 -parameter RegistrationProvidesRandomPasswordP \
+                 -default 0]
+     } {
         set password [ad_generate_random_string]
         set generated_pwd_p 1
     }
     set result(generated_pwd_p) $generated_pwd_p
     set result(password) $password
 
     # Set user's password
-    set user_id [acs_user::get_by_username -username $username]
+    set user_id [acs_user::get_by_username -authority_id $authority_id -username $username]
     ad_change_password $user_id $password
 
     # Used in messages below