Fix issue with unbinding after authentication.