Small user controller changes - not important