Fix edit user scenario
Fix browse user role scenario