Well, after about two weeks the car locked itself again. I ended up bying a new pump and conversion kit (which the new pump requires) and the system is now working fine.