Using Upsert in SaveUser. Closes issue #7