fixed issues updating and deleting users
Merge "fixed issues updating and deleting users"