prior lawful residence EEA citizen

[Sakura.m]

My question is about prior lawful residence.
I am a EEA citizen married to a EEA citizen (same citizenship).
We came in the uk together, we were not married but started to live together immediately.
At the time before the wedding he was working but i wasn't exercising treaty rights.
After few years in Uk (less than 3 years) we went back yo our home country for few days and got married there then we came back together. Now my question is:
can i still be considered his family member even if before the wedding I didn't have a lawful residence in uk ?
In this case, do I need a CSI and to be considered self-sufficient ?
thank you.