Update User.php

Smaller Bug fixes
Merge pull request #22 from Pihaar/patch-5

Update User.php