Changes to reuse authentication token flag