Improved Users Controller