Fix flow for revoke