Updated admin, user controller