Fix some bugs with the User promises.