Fix user controller
Fix all the things