I would check two things;
* Door jamb wiring (I think it was more prominent in the B6 gen though)
* Follow this video from VCDS (if you have it), this is what I reference every time I disconnect battery or something: https://www.youtube.com/watch?v=o_DrT8W-_uQ