Merge add new user and update tokens into one function

[mate-amargo]

I guess we are ok with that, since I don't wanna slow us down with code review time I'll just merge this, and we can revert it or change it later.