User controller tweak