Patch 1

This patch fixes an issue when there are multiples tokens to be deleted, it ensures that the token passed in the header is always the active token.