Both versions are correct, but I agree that in both places the same spelling should be used.