Minor fixes for Custom User Model

about username field