Fix inconsistent pre-selection of last logged in user