Fixes for UpdateUser
Merge branch 'master' of github.com:jeffreyrack/hodor