Merge "Reset all tokens on login"