diff --git a/tasks/auth_initialization.yml b/tasks/auth_initialization.yml
index 00e7efd..3d3be5e 100644
--- a/tasks/auth_initialization.yml
+++ b/tasks/auth_initialization.yml
@@ -47,7 +47,7 @@
     login_password: "{{ mongodb_user_admin_password }}"
   with_items:
     - "{{ mongodb_users }}"
-  when: mongodb_users is defined and ansible_local.mongodb.mongodb_login_port is undefined
+  when: mongodb_users is defined and ansible_local.mongodb.mongodb.mongodb_login_port is undefined
 
 - name: Create facts.d directory
   file:
diff --git a/tasks/auth_initialization_ald.yml b/tasks/auth_initialization_ald.yml
index 1c27b8e..7ebfa90 100644
--- a/tasks/auth_initialization_ald.yml
+++ b/tasks/auth_initialization_ald.yml
@@ -1,11 +1,11 @@
-- name: create administrative user siteRootAdmin
+- name: create administrative user siteRootAdmin port=yes
   mongodb_user:
     database: admin
     name: "{{ item.name }}"
     password: "{{ item.password }}"
     roles: "{{ item.roles }}"
     login_host: 127.0.0.1
-    login_port: "{{ ansible_local.mongodb.mongodb.mongodb_login_port|default(27017) }}"
+    login_port: "{{ ansible_local.mongodb.mongodb.mongodb_login_port }}"
   with_items:
     - {
       name: "{{ mongodb_root_admin_name }}",
@@ -13,14 +13,14 @@
       roles: "root"
       }
 
-- name: create administrative user siteUserAdmin
+- name: create administrative user siteUserAdmin port=yes
   mongodb_user:
     database: admin
     name: "{{ item.name }}"
     password: "{{ item.password }}"
     roles: "{{ item.roles }}"
     login_host: 127.0.0.1
-    login_port: "{{ ansible_local.mongodb.mongodb_login_port|default(27017) }}"
+    login_port: "{{ ansible_local.mongodb.mongodb.mongodb_login_port }}"
   with_items:
     - {
       name: "{{ mongodb_user_admin_name }}",
@@ -36,7 +36,7 @@
     roles: "{{ item.roles }}"
     replica_set: "{{ mongodb_conf_replSet }}"
     login_host: 127.0.0.1
-    login_port: "{{ ansible_local.mongodb.mongodb_login_port|default(27017) }}"
+    login_port: "{{ ansible_local.mongodb.mongodb.mongodb_login_port }}"
     login_user: "{{ mongodb_user_admin_name }}"
     login_password: "{{ mongodb_user_admin_password }}"
   with_items: