diff --git a/ipaserver/install/adtrust.py b/ipaserver/install/adtrust.py
index ea279b56b..0409743ee 100644
--- a/ipaserver/install/adtrust.py
+++ b/ipaserver/install/adtrust.py
@@ -530,43 +530,26 @@ def generate_dns_service_records_help(api):
 
 
 @group
-class ADTrustInstallInterface(ServiceAdminInstallInterface):
+class SIDInstallInterface(ServiceAdminInstallInterface):
     """
-    Interface for the AD trust installer
+    Interface for the SID generation Installer
 
     Knobs defined here will be available in:
     * ipa-server-install
     * ipa-replica-install
     * ipa-adtrust-install
     """
-    description = "AD trust"
-
-    # the following knobs are provided on top of those specified for
-    # admin credentials
+    description = "SID generation"
     add_sids = knob(
         None,
         description="Add SIDs for existing users and groups as the final step"
     )
-    add_agents = knob(
-        None,
-        description="Add IPA masters to a list of hosts allowed to "
-                    "serve information about users from trusted forests"
-    )
-    add_agents = replica_install_only(add_agents)
-    enable_compat = knob(
-        None,
-        description="Enable support for trusted domains for old clients"
-    )
+    add_sids = replica_install_only(add_sids)
     netbios_name = knob(
         str,
         None,
         description="NetBIOS name of the IPA domain"
     )
-    no_msdcs = knob(
-        None,
-        description="Deprecated: has no effect",
-        deprecated=True
-    )
     rid_base = knob(
         int,
         1000,
@@ -578,3 +561,34 @@ class ADTrustInstallInterface(ServiceAdminInstallInterface):
         description="Start value of the secondary range for mapping "
                     "UIDs and GIDs to RIDs"
     )
+
+
+@group
+class ADTrustInstallInterface(SIDInstallInterface):
+    """
+    Interface for the AD trust installer
+
+    Knobs defined here will be available in:
+    * ipa-server-install
+    * ipa-replica-install
+    * ipa-adtrust-install
+    """
+    description = "AD trust"
+
+    # the following knobs are provided on top of those specified for
+    # admin credentials
+    add_agents = knob(
+        None,
+        description="Add IPA masters to a list of hosts allowed to "
+                    "serve information about users from trusted forests"
+    )
+    add_agents = replica_install_only(add_agents)
+    enable_compat = knob(
+        None,
+        description="Enable support for trusted domains for old clients"
+    )
+    no_msdcs = knob(
+        None,
+        description="Deprecated: has no effect",
+        deprecated=True
+    )