RPV-132 - Fix for removing the email verification table out of the query to improve performance