diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html
index 421cac059c..cfe5e548c0 100644
--- a/InvenTree/build/templates/build/detail.html
+++ b/InvenTree/build/templates/build/detail.html
@@ -170,7 +170,7 @@
         {% if build.active %}
         <div class='btn-group' role='group'>
             <button class='btn btn-success' type='button' id='btn-auto-allocate' title='{% trans "Allocate stock to build" %}'>
-                <span class='fas fa-magic'></span> {% trans "Auto Allocate" %}
+                <span class='fas fa-sign-in-alt'></span> {% trans "Allocate Stock" %}
             </button>
             <button class='btn btn-danger' type='button' id='btn-unallocate' title='{% trans "Unallocate stock" %}'>
                 <span class='fas fa-minus-circle'></span> {% trans "Unallocate Stock" %}
diff --git a/InvenTree/templates/js/translated/build.js b/InvenTree/templates/js/translated/build.js
index 27b189902e..d1d53a9e9f 100644
--- a/InvenTree/templates/js/translated/build.js
+++ b/InvenTree/templates/js/translated/build.js
@@ -383,7 +383,7 @@ function loadBuildOutputAllocationTable(buildInfo, output, options={}) {
                 partId,
                 {
                     success: function(data) {
-                        console.log("here we go I guess");
+                        // TODO: Reload table
                     },
                     parts: [
                         parseInt(pk),
@@ -959,13 +959,17 @@ function allocateStockToBuild(build_id, part_id, options={}) {
                                     filters: {
                                         part: bom_item.sub_part,
                                         in_stock: true,
-                                        part_detail: true,
+                                        part_detail: false,
                                         location_detail: true,
                                     },
                                     model: 'stockitem',
+                                    required: true,
                                     render_part_detail: false,
                                     render_location_detail: true,
-                                    // TODO: Auto-assign value?
+                                    auto_fill: true,
+                                    noResults: function(query) {
+                                        return '{% trans "No matching stock items" %}';
+                                    }
                                 },
                                 null,
                                 options,
diff --git a/InvenTree/templates/js/translated/forms.js b/InvenTree/templates/js/translated/forms.js
index 2fc650e0e6..4034908073 100644
--- a/InvenTree/templates/js/translated/forms.js
+++ b/InvenTree/templates/js/translated/forms.js
@@ -1280,7 +1280,7 @@ function initializeRelatedField(field, fields, options) {
 
     if (!field.api_url) {
         // TODO: Provide manual api_url option?
-        console.log(`Related field '${name}' missing 'api_url' parameter.`);
+        console.log(`WARNING: Related field '${name}' missing 'api_url' parameter.`);
         return;
     }
 
@@ -1301,6 +1301,15 @@ function initializeRelatedField(field, fields, options) {
         placeholder: '',
         dropdownParent: $(options.modal),
         dropdownAutoWidth: false,
+        language: {
+            noResults: function(query) {
+                if (field.noResults) {
+                    return field.noResults(query);
+                } else {
+                    return '{% trans "No results found" %}';
+                }
+            }
+        },
         ajax: {
             url: field.api_url,
             dataType: 'json',
@@ -1415,8 +1424,10 @@ function initializeRelatedField(field, fields, options) {
         }
     });
 
+    
     // If a 'value' is already defined, grab the model info from the server
     if (field.value) {
+        
         var pk = field.value;
         var url = `${field.api_url}/${pk}/`.replace('//', '/');
 
@@ -1425,6 +1436,25 @@ function initializeRelatedField(field, fields, options) {
                 setRelatedFieldData(name, data, options);
             }
         });
+    } else if (field.auto_fill) {
+        // Attempt to auto-fill the field
+
+        var filters = field.filters || {};
+
+        // Enforce pagination, limit to a single return (for fast query)
+        filters.limit = 1;
+        filters.offset = 0;
+
+        inventreeGet(field.api_url, field.filters || {}, {
+            success: function(data) {
+
+                // Only a single result is available, given the provided filters
+                if (data.count == 1) {
+                    setRelatedFieldData(name, data.results[0], options);
+                }
+            }
+        });
+
     }
 }
 
diff --git a/InvenTree/templates/js/translated/model_renderers.js b/InvenTree/templates/js/translated/model_renderers.js
index 86a12013a2..3136ebee29 100644
--- a/InvenTree/templates/js/translated/model_renderers.js
+++ b/InvenTree/templates/js/translated/model_renderers.js
@@ -47,7 +47,11 @@ function renderCompany(name, data, parameters, options) {
 // eslint-disable-next-line no-unused-vars
 function renderStockItem(name, data, parameters, options) {
 
-    var image = data.part_detail.thumbnail || data.part_detail.image || blankImage();
+    var image = blankImage();
+    
+    if (data.part_detail) {
+        image = data.part_detail.thumbnail || data.part_detail.image || blankImage();
+    }
 
     var html = '';