Fixing User Email Issue