I've tried the WD40 approach but hasn't had any success, both doors do lock as long as you push both handles in at the same time.

Both doors don't lock from the outside, unless you lock both doors with two keys at the same time.

Any other ideas?