I'm guessing that you never killed it off completely the first time, although that's pretty much a WAG....but the fact that you had greenish water draining out of your filter tells me you still had living algae it there. This time keep your shock levels up for a couple of days or so after your water clears and it should get it all this time.

Janet