Fixed bug in create-user where you would switch to last created users after you refreshed
Merge branch 'rmatthews384'