Saving user token in a sync storage and a few small issues