diff --git a/tasks/auth_initialization.yml b/tasks/auth_initialization.yml
index bba7919..0bc107d 100644
--- a/tasks/auth_initialization.yml
+++ b/tasks/auth_initialization.yml
@@ -33,6 +33,19 @@
       roles: "root"
       }
 
+- name: create normal users
+  mongodb_user:
+    database: "{{ item.database }}"
+    name: "{{ item.name }}"
+    password: "{{ item.password }}"
+    roles: "{{ item.roles }}"
+    replica_set: "{{ mongodb_conf_replSet }}"
+    login_user: "{{ mongodb_user_admin_name }}"
+    login_password: "{{ mongodb_user_admin_password }}"
+    login_port: "{{ mongodb_conf_port }}"
+  with_items:
+    - "{{ mongodb_users }}"
+
 - name: Move back mongod.conf
   template: src=mongod.conf.j2 dest=/etc/mongod.conf owner=root group=root mode=0644
 
diff --git a/tasks/main.yml b/tasks/main.yml
index c03091c..e517845 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -20,10 +20,6 @@
   when: mongodb_conf_auth and not mongodb_conf_replSet
   tags: [mongodb]
 
-- include: user_add.yml
-  when: mongodb_conf_auth and mongodb_users
-  tags: [mongodb]
-
 - include: mms-agent.yml
   when: mongodb_mms_api_key != ""
   tags: [mongodb]
diff --git a/tasks/user_add.yml b/tasks/user_add.yml
deleted file mode 100644
index 656dc89..0000000
--- a/tasks/user_add.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-
-- name: create normal users
-  mongodb_user:
-    database: "{{ item.database }}"
-    name: "{{ item.name }}"
-    password: "{{ item.password }}"
-    roles: "{{ item.roles }}"
-    replica_set: "{{ mongodb_conf_replSet }}"
-    login_user: "{{ mongodb_user_admin_name }}"
-    login_password: "{{ mongodb_user_admin_password }}"
-    login_port: "{{ mongodb_conf_port }}"
-  with_items:
-    - "{{ mongodb_users }}"