Reorganizing find/create user