diff --git a/InvenTree/order/templates/order/order_wizard/select_parts.html b/InvenTree/order/templates/order/order_wizard/select_parts.html
index 0e77fe4796..fc4c5c3801 100644
--- a/InvenTree/order/templates/order/order_wizard/select_parts.html
+++ b/InvenTree/order/templates/order/order_wizard/select_parts.html
@@ -2,6 +2,10 @@
 
 {% block form %}
 
+<h4>
+    Step 1 of 2 - Select Parts
+</h4>
+
 {% if parts|length > 0 %}
 <div class='alert alert-info alert-block' role='alert'>
     Select suppliers for {{ parts|length }} parts.
@@ -18,7 +22,7 @@
 
     <input type='hidden' name='form_step' value='select_parts'/>
 
-    <table class='table table-condensed table-striped' id='part-table'>
+    <table class='table table-condensed table-striped' id='order-wizard-part-table'>
         <tr>
             <th>Part</th>
             <th>Supplier</th>
@@ -61,5 +65,5 @@
         </tr>
         {% endfor %}
     </table>
-
+</form>
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/order/templates/order/order_wizard/select_pos.html b/InvenTree/order/templates/order/order_wizard/select_pos.html
new file mode 100644
index 0000000000..140527f72e
--- /dev/null
+++ b/InvenTree/order/templates/order/order_wizard/select_pos.html
@@ -0,0 +1,49 @@
+{% extends "modal_form.html" %}
+
+{% block form %}
+
+<h4>
+    Step 2 of 2 - Select Purchase Orders
+</h4>
+
+<div class='alert alert-info alert-block' role='alert'>
+    Select existing purchase orders, or create new orders.
+</div>
+
+<form method='post' action='' class='js-modal-form' enctype='multipart/form-data'>
+    {% csrf_token %}
+    {% load crispy_forms_tags %}
+
+    <input type='hidden' name='form_step' value='select_purchase_orders'/>
+
+    <table class='table table-condensed table-striped' id='order-wizard-po-table'>
+        <tr>
+            <th>Supplier</th>
+            <th>Items</th>
+            <th>Purchase Order</th>
+        </tr>
+        {% for supplier in suppliers %}
+        <tr id='suppier_row_{{ supplier.id }}'>
+            <td>
+                {% include 'hover_image.html' with image=supplier.image hover=False %}
+                {{ supplier.name }}
+            </td>
+            <td>{{ supplier.order_items|length }}</td>
+            <td>
+                <div class='control-group'>
+                    <div class='controls'>
+                        <select
+                            class='select'
+                            id='id_purchase_order_{{ supplier.id }}'
+                            name='purchase_order_{{ supplier.id }}'>
+                            <option value=''>---------</option>
+                        </select>
+                    </div>
+                </div>
+            </td>
+        </tr>
+        {% endfor %}
+
+    </table>
+</form>
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py
index bf2561233d..68273f7410 100644
--- a/InvenTree/order/views.py
+++ b/InvenTree/order/views.py
@@ -155,15 +155,41 @@ class OrderParts(AjaxView):
 
     # List of Parts we wish to order
     parts = []
+    suppliers = []
 
     def get_context_data(self):
 
         ctx = {}
 
         ctx['parts'] = sorted(self.parts, key=lambda part: int(part.order_quantity), reverse=True)
+        ctx['suppliers'] = self.suppliers
 
         return ctx
 
+    def get_suppliers(self):
+        """ Calculates a list of suppliers which the user will need to create POs for.
+        This is calculated AFTER the user finishes selecting the parts to order.
+        Crucially, get_parts() must be called before get_suppliers()
+        """
+
+        suppliers = {}
+
+        for part in self.parts:
+            supplier_part_id = part.order_supplier
+
+            try:
+                supplier = SupplierPart.objects.get(pk=supplier_part_id).supplier
+            except SupplierPart.DoesNotExist:
+                continue
+
+            if not supplier.name in suppliers:
+                supplier.order_items = []
+                suppliers[supplier.name] = supplier
+                
+            suppliers[supplier.name].order_items.append(part)
+
+        self.suppliers = [suppliers[key] for key in suppliers.keys()]
+
     def get_parts(self):
         """ Determine which parts the user wishes to order.
         This is performed on the initial GET request.
@@ -279,6 +305,9 @@ class OrderParts(AjaxView):
 
         self.parts = []
 
+        # Any errors for the part selection form?
+        errors = False
+
         for item in self.request.POST:
             
             if item.startswith('supplier-'):
@@ -316,12 +345,18 @@ class OrderParts(AjaxView):
 
                 self.parts.append(part)
 
-                print(part.name, part.order_supplier, part.order_quantity)
+                if supplier_part is None:
+                    errors = True
 
         data = {
             'form_valid': False,
         }
 
+        # No errors? Proceed to PO selection form
+        if errors == False:
+            self.ajax_template_name = 'order/order_wizard/select_pos.html'
+            self.get_suppliers()
+
         return self.renderJsonResponse(self.request, data=data)