diff --git a/tasks/config.yaml b/tasks/config.yaml
index 58ce556..c64f851 100644
--- a/tasks/config.yaml
+++ b/tasks/config.yaml
@@ -12,19 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
-- name: Create group account.
-  become: yes
-  group:
-    name: "{{ nodepool_user_group }}"
-
-- name: Create user account.
-  become: yes
-  user:
-    createhome: yes
-    home: "{{ nodepool_user_home }}"
-    group: "{{ nodepool_user_group }}"
-    name: "{{ nodepool_user_name }}"
-
 - name: Create required directories.
   become: yes
   file:
diff --git a/tasks/main.yaml b/tasks/main.yaml
index d3942a0..9da844e 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -15,6 +15,8 @@
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yaml"
 
+- include: pre.yaml
+
 - include: install.yaml
   become: yes
 
diff --git a/tasks/pre.yaml b/tasks/pre.yaml
new file mode 100644
index 0000000..2f78d2d
--- /dev/null
+++ b/tasks/pre.yaml
@@ -0,0 +1,26 @@
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+---
+- name: Create group account.
+  become: yes
+  group:
+    name: "{{ nodepool_user_group }}"
+
+- name: Create user account.
+  become: yes
+  user:
+    createhome: yes
+    group: "{{ nodepool_user_group }}"
+    home: "{{ nodepool_user_home }}"
+    name: "{{ nodepool_user_name }}"