Code cleanup for user.php
Merge branch 'dstockto-user_cleanup'