Reintroduce username select, persist username