fix the issue with new token expiry not being saved, save blank expiry as -1