Fix refactoring issue

email_password does not have global scope, nor should it!