Added support for turning off registration in addition to finishing proper group support.