This is not a big problem since we're not verifying emails atm. However, in the future, we need separate fields.