Minor refactor of how the keyring user token get's set.