Front Left Turn Signal - Help Identifying Part # (Pics Incl.)

My front left turn signal is not working. The illuminated light symbol was on in my dash. I did some investigating, and it seems that the bulb is not making contact with the housing. I took apart the light assembly and pushed down on the bulb, with the turn signal in gear, and it worked. I let go of my finger, and the bulb popped up about 1/8 of an inch, and poof, it stopped working. I have attached a picture of the parts.

I have a 2002 330i.

What are the part numbers for the black piece (which fits into the white housing) and the actual white housing?

I also attached a diagram that i found on realoem, but it doesnt seem to match my OEM setup. It would be #3, but that does not look like what I have. Very weird.

Link: http://www.realoem.com/bmw/showparts...31&hg=63&fg=10

If it is indeed #3, would the black piece that fits inside come with the part? Which #3 is it? There are 2 to choose from. I found it on pelican parts for $7.80.

I want to order the bulb housing myself, since its probably 8-10$, and I can fix it myself. Any help with the part #?