refactored email and user email