User for investments is no longer unique
Fix merge conflicts
Merge pull request #257 from krazemon/investments

User for investments is no longer unique