many fixes and updates for user create/edit flow