Tokens should be saved correctly now