diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html
index 3f7f36698..8a37e7eaf 100755
--- a/baseTemplate/templates/baseTemplate/index.html
+++ b/baseTemplate/templates/baseTemplate/index.html
@@ -73,7 +73,7 @@
 
     <script src="{% static 'baseTemplate/angularjs.1.6.5.js' %}"></script>
     <script src="{% static 'baseTemplate/jquery.3.2.1.js' %}"></script>
-
+    <script src="{% static 'baseTemplate/custom-js/system-status.js' %}"></script>
 
     <!-- HELPERS -->
 
@@ -1196,7 +1196,6 @@
         <script src="https://cdnjs.cloudflare.com/ajax/libs/qrious/4.0.2/qrious.js"></script>
         <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
         <script src="{% static 'baseTemplate/custom-js/pnotify.custom.min.js' %}"></script>
-        <script src="{% static 'baseTemplate/custom-js/system-status.js' %}?ver={{ version }}"></script>
         <script src="{% static 'packages/packages.js' %}?ver={{ version }}"></script>
         <script src="{% static 'websiteFunctions/websiteFunctions.js' %}?ver={{ version }}"></script>
         <script src="{% static 'tuning/tuning.js' %}?ver={{ version }}"></script>
diff --git a/websiteFunctions/templates/websiteFunctions/WPsitesList.html b/websiteFunctions/templates/websiteFunctions/WPsitesList.html
index 033197934..cc0d12d48 100644
--- a/websiteFunctions/templates/websiteFunctions/WPsitesList.html
+++ b/websiteFunctions/templates/websiteFunctions/WPsitesList.html
@@ -4,7 +4,14 @@
 
 {% block header_scripts %}
     <script>
-        // Get the existing CyberCP module instead of trying to create it
+        // Create or get the CyberCP module
+        try {
+            angular.module('CyberCP');
+        } catch(err) {
+            angular.module('CyberCP', []);
+        }
+
+        // Now add our controller to the module
         angular.module('CyberCP').controller('listWordPressSites', function($scope, $http) {
             // Initialize scope variables
             $scope.wpSites = JSON.parse('{{ wpsite|escapejs }}');