Improve default field choices
Login is presistant