diff --git a/roles/ipaserver/library/ipaserver_setup_adtrust.py b/roles/ipaserver/library/ipaserver_setup_adtrust.py
index 954e1df..eb2abf2 100644
--- a/roles/ipaserver/library/ipaserver_setup_adtrust.py
+++ b/roles/ipaserver/library/ipaserver_setup_adtrust.py
@@ -49,13 +49,15 @@ RETURN = '''
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.ansible_ipa_server import *
 
+from ipalib import api
+
 def main():
     ansible_module = AnsibleModule(
         argument_spec = dict(
             # basic
             hostname=dict(required=False),
-            setup_ca=dict(required=True, type='bool', default=False),
-            setup_adtrust=dict(required=True, type='bool', default=False),
+            setup_ca=dict(required=False, type='bool', default=False),
+            setup_adtrust=dict(required=False, type='bool', default=False),
         ),
     )
 
@@ -73,7 +75,8 @@ def main():
     fstore = sysrestore.FileStore(paths.SYSRESTORE)
     sstore = sysrestore.StateFile(paths.SYSRESTORE)
 
-    api_Backend_ldap2_connect(options.host_name, options.setup_ca)
+#    api_Backend_ldap2_connect(options.host_name, options.setup_ca)
+    api.Backend.ldap2.connect(options.host_name, options.setup_ca)
 
     # setup ds ######################################################
 
diff --git a/roles/ipaserver/library/ipaserver_test.py b/roles/ipaserver/library/ipaserver_test.py
index 98502de..27e478c 100644
--- a/roles/ipaserver/library/ipaserver_test.py
+++ b/roles/ipaserver/library/ipaserver_test.py
@@ -117,6 +117,7 @@ def main():
             netbios_name=dict(required=False),
             rid_base=dict(required=False, type='int'),
             secondary_rid_base=dict(required=False, type='int'),
+            add_sids=dict(required=False, type='bool', default=False),
 
             ### additional ###
         ),
@@ -192,6 +193,7 @@ def main():
     options.netbios_name = ansible_module.params.get('netbios_name')
     options.rid_base = ansible_module.params.get('rid_base')
     options.secondary_rid_base = ansible_module.params.get('secondary_rid_base')
+    options.add_sids = ansible_module.params.get('add_sids')
 
     ### additional ###
     options.kasp_db_file = None