bug fixes
Merge pull request #824 from edx/jarv/user-refactor

bug fixes