User
Merge pull request #560 from nla/ti_fixes

Forgot User Class