A few months ago I was at the range with a friend and the trigger suddenly went dead on my Bersa .380, well halfway anyway. It didn't seem to be catching the hammer when I pulled the trigger. It happened just a few times at first, but then it would only fire on one out of five or six trigger pulls so I called it a day. Later in the day I took it to a gunsmith who fixed it no charge after a big speech on how much of a piece of junk Bersa makes (whatever). He told me there was a washer that had wiggled loose causing the trigger linkage to get out of wack.
Today I was getting it ready for the range and I noticed the trigger was dead again. After inspecting it further I noticed that this time double action the hammer would not catch, single action was fine.
I know practically nothing about the inner workings of guns, but I am pretty mechanically inclined so after a good look at this breakdown tutorial http://www.geocities.com/bersa_thunder/manual1c.html I decided to pull the grips and check it out, instead of getting hassled by another arrogant gunsmith.
The first thing I noticed was the grip was sticking out a little bit on the right side.

I pulled the grip then noticed this little spring had become dislodged.

I replaced the spring and everything seemed to work properly. Trigger pulled strong, dropped the hammer in both double and single action. When I put the grips back on I noticed the grip is not sitting flush on the frame. Do I need to replace the grip?

Is this a common problem on these guns? I have searched but can't find anything on this issue.
This is my first pistol, it has around 1000 rounds through it and has performed perfectly except for these two failures. I'm curious as to what is causing this spring to pop out and how to prevent it in the future as I plan to get my CHL in the next month or so and don't want to carry an unreliable pistol.
I appreciate yall's help on this.