Driver door window issue

[kiwiboxster]

Hi there. Had an issue with the driver door window intermittently going back up after opening the door. I replaced the door microswitch but there was really nothing wrong with the old one. Problem still persists but did notice when I shut the door with the window up, the window does go down the required distance when I reshut for the second time. I looked at the door latching mechanism at the rear of the door and it appears there is quite bit of grease and the bottom bar does not operate like the passenger door one. I've enclosed some photos. The first is the latch in the faulty position, the second the latch in the right position, and the last is the passenger door latch. Do I need a new door latch mechansim, or can I pull it out and readjust?
Thanks
Kevin