- Fix of the correct token check

- Added saving of the user token