Fixes

* Fixed EntityResolver
* Updated UserController