Reverted to the old user controller