Fix user and role edit