Tidy up the controller to accomodate legacy invites