Replace email field with username field