I found the 504 needed to be forced into accepting non-controller status but if you manually set that it was then happy. I presume the same for forcing it to be controller.