Front passenger door lock

Hi all,

My front side passenger door lock is driving me crazy. Quite a while, during driving over rough surfaces, it would automaticly lock only to be unlocked with the key from the outside...
So the dealership suggested me to change the actuator, which I did. The rough surfaces problem seems fixed, but it won't unlock with central locking. Only if I open it with the key from that side. When I try to open it from the drivers side door, it automaticly locks again (yes, a good anti-theft system, but not what I had in mind...)
Is there any way to adjust the lock so it works again?

By the way, it's a '99 GR