Modified Users Controller