Make some changes on user controller