Fixed conflicts and problems with user controller