Don't modify the authentication token if it is already set
Minor code clean up