Replaced email field with username