Changed it so user token is only reset on login when the token is expired.  This prevents logging into other browsers as the same user breaking the other browser site.