Finish user edit and update actions
Merge branch 'updating-users'