diff --git a/maas/region.sls b/maas/region.sls
index 60ccfdd..8edef35 100644
--- a/maas/region.sls
+++ b/maas/region.sls
@@ -137,6 +137,14 @@
   - require:
     - cmd: maas_login_admin
 
+{%- if region.get('boot_sources', False)  %}
+maas_boot_sources:
+  module.run:
+  - name: maas.process_boot_sources
+  - require:
+    - cmd: maas_set_admin_password
+{%- endif %}
+
 {%- if region.get('commissioning_scripts', False)  %}
 /etc/maas/files/commisioning_scripts/:
   file.directory:
@@ -193,14 +201,6 @@
     {%- endif %}
 {%- endif %}
 
-{%- if region.get('boot_sources', False)  %}
-maas_boot_sources:
-  module.run:
-  - name: maas.process_boot_sources
-  - require:
-    - module: maas_config
-{%- endif %}
-
 {%- if region.get('dhcp_snippets', False)  %}
 maas_dhcp_snippets:
   module.run: