1981 mk1 golf oil and battery light not showing on ignition/start up.

hi all,
The battery light and oil light doesn't seem to light up anymore. this morning it did fine. then it stopped working, i wiggled a few wires under the passenger glove box where the fuse board is and it was working again, i just don't know if tis was a coincidence or if it actually fixed anything. hopefully someone on here can help.
i am new to the VW scene and got a bit of a project on my hands. I'm usually a landcover kind of guy but was left this car by a old customer where i used to work. which is lovely and it has great potential, just not 100% sure on what I'm doing just yet. thanks very much. 

The battery light is fed from the battery the output then goes to the blue exciter wire on the Alternator to start the field coils, once the field is built it is back biased by the alternators 13V to turn off.

The oil light is fed off of the black wire on the cluster 12Vdc in and the ground for the light comes from the single pin connector on the oil pressure switch on the right side of the head as you are looking at it.

The clocks are probably where your issues lie as the connector can be loose, or corroded.  I would start by splicing a wire from the clusters brown wire (on the wire side of the main connector and tie it to ground behind the cluster.

If you haven't checked your battery cables for voltage drop, and they are still original I would do that first, that is battery to frame, and frame to engine/tranny.