Fix updateUser and timeouts
Merge pull request #1 from sraka1/master

Fix updateUser and timeouts