User email field, small fixes