fixes
Merge pull request #112 from geekhub-php/user-fixes2

fixes from old mergeaccounts branch