Fix some issues with CredentialsNeedUpdate handling