diff --git a/module/build/js/common.ui.js b/module/build/js/common.ui.js
index e4d67b3b5f..4930cc3bad 100644
--- a/module/build/js/common.ui.js
+++ b/module/build/js/common.ui.js
@@ -31,6 +31,22 @@ window.loadBranches = function(productID)
     }, 'json');
 }
 
+window.loadSystem = function(productID)
+{
+    productID = parseInt(productID);
+    if(!productID) productID = $('input[name=product]').val();
+    if(typeof(productID) == "undefined") return;
+
+    $.get($.createLink('build', 'ajaxGetSystemList', 'productID=' + productID), function(data)
+    {
+        if(data)
+        {
+            const $systemPicker = $('[name=system]').zui('picker');
+            $systemPicker.render({items: data});
+        }
+    }, 'json');
+}
+
 window.setSystemBox = function(e)
 {
     const newSystem = $(e.target).is(':checked') ? 1 : 0;
diff --git a/module/build/js/create.ui.js b/module/build/js/create.ui.js
index 5d13fe1be0..a75cdeacde 100644
--- a/module/build/js/create.ui.js
+++ b/module/build/js/create.ui.js
@@ -63,6 +63,7 @@ $().ready(function()
         }
     });
     loadBranches();
+    loadSystem();
     if(multipleProject)
     {
         window.waitDom('[name=execution]', function()
@@ -99,6 +100,7 @@ function loadProducts(executionID)
 
             $('select[name^=builds]').attr('data-placeholder', multipleSelect);
             loadBranches(productID);
+            loadSystem(productID);
         }
         else
         {
@@ -109,6 +111,7 @@ function loadProducts(executionID)
     });
 
     loadLastBuild();
+    loadSystem();
 }
 
 /**