Index: openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl,v
diff -u -r1.89.2.5 -r1.89.2.6
--- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	5 Jul 2016 16:39:24 -0000	1.89.2.5
+++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	12 Sep 2016 11:06:41 -0000	1.89.2.6
@@ -211,7 +211,7 @@
             }
             return [array get result]
         }
-        set user_id [cc_lookup_email_user $email]
+        set user_id [party::get_by_email -email $email]
         if { $user_id eq "" } {
             set result(auth_status) "no_account"
             set result(auth_message) [_ acs-subsite.Unknown_email]
Index: openacs-4/packages/acs-authentication/tcl/password-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/password-procs.tcl,v
diff -u -r1.19.2.3 -r1.19.2.4
--- openacs-4/packages/acs-authentication/tcl/password-procs.tcl	20 Oct 2015 08:19:13 -0000	1.19.2.3
+++ openacs-4/packages/acs-authentication/tcl/password-procs.tcl	12 Sep 2016 11:06:41 -0000	1.19.2.4
@@ -178,7 +178,7 @@
             }
             return [array get result]
         }
-        set user_id [cc_lookup_email_user $email]
+        set user_id [party::get_by_email -email $email]
         if { $user_id eq "" } {
             set result(password_status) "failed_to_connect"
             set result(password_message) "Unknown email"
@@ -248,7 +248,7 @@
             set authority_id [auth::authority::local]
         }
     } else {
-        set user_id [cc_lookup_email_user $email]
+        set user_id [party::get_by_email -email $email]
         if { $user_id ne "" } {
             acs_user::get -user_id $user_id -array user
             set authority_id $user(authority_id)
Index: openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl,v
diff -u -r1.8.2.2 -r1.8.2.3
--- openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl	10 Sep 2015 08:21:14 -0000	1.8.2.2
+++ openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl	12 Sep 2016 11:08:19 -0000	1.8.2.3
@@ -192,7 +192,7 @@
     set response_url [tclwebtest::response url]
 
     if { ![string match "*${home_uri}*" $response_url] } {
-        if { [cc_lookup_email_user $email] eq "" } {
+        if { [party::get_by_email -email $email] eq "" } {
             error "Failed to login user with email=\"$email\" and password=\"$password\". No user with such email in database."
         } else {
             ns_log Error "Failed to log in user with email=\"$email\" and password=\"$password\" eventhough email exists (password may be incorrect). response_body=[tclwebtest::response body]"