Save token with user, eliminate some environment variables