Finish updating users
Merge branch 'updating-users'