Comment 20 for bug 1491117

Thanks to a great suggestion from Lin, who suggested looking at the user model problem differently and considering the PK attribute, I have created two patches: one for DOA and the other for Horizon. These fix the problem without needing a monkey-patch.