Modified user controller