diff --git a/module_utils/ansible_ipa_server.py b/module_utils/ansible_ipa_server.py
index 568291d25975ce8e79e954fb7dca2f4e65bec398..8e8f9b5c368ce36da1b2ee0a893963ec78ca94cd 100644
--- a/module_utils/ansible_ipa_server.py
+++ b/module_utils/ansible_ipa_server.py
@@ -63,7 +63,7 @@ if NUM_VERSION >= 40500:
     from ipaplatform.tasks import tasks
     from ipalib import api, errors, x509
     from ipalib.constants import DOMAIN_LEVEL_0, MIN_DOMAIN_LEVEL, MAX_DOMAIN_LEVEL
-    if NUM_VERSION < 40600:
+    if NUM_VERSION == 40504:
         from ipalib.constants import IPAAPI_USER
     from ipalib.util import (
         validate_domain_name,
diff --git a/roles/ipaserver/library/ipaserver_setup_ds.py b/roles/ipaserver/library/ipaserver_setup_ds.py
index 5189c02c9368616601d72e4936f432390ed2d57b..062fd39c52311ae3192a1322c046d7ecd307cfbc 100644
--- a/roles/ipaserver/library/ipaserver_setup_ds.py
+++ b/roles/ipaserver/library/ipaserver_setup_ds.py
@@ -124,8 +124,10 @@ def main():
 
     # setup DS ##############################################################
 
-    if NUM_VERSION < 40600:
-        # Make sure tmpfiles dir exist before installing components
+    # Make sure tmpfiles dir exist before installing components
+    if NUM_VERSION == 40504:
+        tasks.create_tmpfiles_dirs(IPAAPI_USER)
+    elif NUM_VERSION >= 40500 and NUM_VERSION <= 40503:
         tasks.create_tmpfiles_dirs()
 
     # Create a directory server instance