Fix for email user login problem