Fix membership tests after name/login change