Merge "Do not set preferred email until after registration"