Such a simple fix for associations on users and clients, but seemed overly complicated at the time
Merge branch 'master' of https://github.com/gattik/smartprovider