Username field fix
Import bug fixed