Username field fix