Wholesale customers double dipping

We have a problem with some wholesale customers beating the system.  They sign up as wholesale customers and then as affiliates.  All with the same name!  First they get the lower price as a wholesale customer and then they get 10% commissions for being an affiliate.  We've just noticed this problem by accident and it really hurts our business.  There should be some kind of safeguard in PC preventing affiliates on earning commissions on wholesale orders.   Has this been addressed in version 3.5? 
Katharina

We have the rules up for wholesale and the affiliate thing.  You are not allowed to earn affiliate commissions on your own order regardless of wholesale or retail.  Affiliates and wholesale customers have to get approved by us.  The problem is that we have over 200 affiliates at this point and about 60 wholesale customers.  We are mainly retail, but you know how it is they want wholesale options.  So we offered it to qualified businesses only.  They have to bring proof of being a business before they even get wholesale.  Most wholesalers are honest, but we had this one lady.  She did rack in some good affiliate commissions on her own orders.  At least we caught it before we did mail out a nice check.  Well she no longer gets wholesale nor is she an affiliate any longer.   There should be some kind of checking on this one, because we cannot monitor it all by ourselves.  Amazon does that kind of checking so affiliates dont get commissions on their own purchase.  Sure there is always the possibility of getting another email etc, but lets make it harder in the first place.  We don't offer referral bonuses to wholesaler that refer other wholesalers.  I personally don't want to end up in some kind of MLM business.  There are tight laws about that in the US and some of it is illegal because it is some kind of chain business that could bust. 
Katharina