diff --git a/InvenTree/common/forms.py b/InvenTree/common/forms.py
index 085206b65a..d884ca9d00 100644
--- a/InvenTree/common/forms.py
+++ b/InvenTree/common/forms.py
@@ -180,4 +180,4 @@ class MatchItem(forms.Form):
 
     def get_special_field(self, col_guess, row, file_manager):
         """ function to be overriden in inherited forms to add specific form settings """
-        pass
+        return None
diff --git a/InvenTree/common/views.py b/InvenTree/common/views.py
index 6d6bba5844..e9ec653c41 100644
--- a/InvenTree/common/views.py
+++ b/InvenTree/common/views.py
@@ -176,11 +176,11 @@ class FileManagementFormView(MultiStepFormView):
     """
 
     name = None
-    form_list = [
-        ('upload', forms.UploadFile),
-        ('fields', forms.MatchField),
-        ('items', forms.MatchItem),
-    ]
+    forms = {
+        'upload': forms.UploadFile,
+        'fields': forms.MatchField,
+        'items': forms.MatchItem,
+    }
     form_steps_description = [
         _("Upload File"),
         _("Match Fields"),
@@ -190,29 +190,21 @@ class FileManagementFormView(MultiStepFormView):
     extra_context_data = {}
 
     def __init__(self, *args, **kwargs):
-        """ initialize the FormView """
-        # check if form_list should be overriden
-        if hasattr(self, 'form_list_override'):
-            # check for list
-            if not isinstance(self.form_list_override, list):
-                raise ValueError('form_list_override must be a list')
+        """ initialize the FormView
+        Use the following syntax to override the forms that should be used in the steps:
 
-            # loop through and override /add form_list enrties
-            for entry in self.form_list_override:
-                # fetch postition
-                pos = [self.form_list.index(i) for i in self.form_list if i[0] == 'items']
-                # replace if exists
-                if pos:
-                    self.form_list[pos[0]] = entry
-                # or append
-                else:
-                    self.form_list.append(entry)
+        def __init__(self, *args, **kwargs):
+            self.forms['items'] = self.CustomMatchItem
+            return super().__init__(*args, **kwargs)
+        """
+        # Construct form_list
+        self.form_list = [(key, value) for key, value in self.forms.items()]
 
         # perform all checks and inits for MultiStepFormView
-        super().__init__(*args, **kwargs)
+        super().__init__(self, *args, **kwargs)
 
         # Check for file manager class
-        if not(hasattr(self, 'file_manager_class') and issubclass(self.file_manager_class, FileManager)):
+        if not hasattr(self, 'file_manager_class') and not issubclass(self.file_manager_class, FileManager):
             raise NotImplementedError('A subclass of a file manager class needs to be set!')
 
     def get_context_data(self, form=None, **kwargs):
@@ -414,11 +406,7 @@ class FileManagementFormView(MultiStepFormView):
                     'data': data,
                     'errors': {},
                 }
-
-                # make sure that the row was submitted - solves https://github.com/inventree/InvenTree/pull/1588#issuecomment-847889353
-                row_exist_check = [a for a in self.request.POST.keys() if a.startswith(f'row_{int(row_idx) +1}_')]
-                if True in row_exist_check:
-                    self.rows.append(row)
+                self.rows.append(row)
 
         # In the item selection step: update row data with mapping to form fields
         if form and self.steps.current == 'items':
diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py
index 312c49b6db..fe62c19c95 100644
--- a/InvenTree/order/views.py
+++ b/InvenTree/order/views.py
@@ -581,9 +581,6 @@ class PurchaseOrderUpload(FileManagementFormView):
         """ override MatchItem fields """
         def get_special_field(self, col_guess, row, file_manager):
             """ set special field """
-            # run default
-            super().get_special_field(col_guess, row, file_manager)
-
             # set quantity field
             if 'quantity' in col_guess.lower():
                 return CharField(
@@ -608,6 +605,9 @@ class PurchaseOrderUpload(FileManagementFormView):
                     default_amount=self.clean_nbr(row.get('price', '')),
                 )
 
+            # return default
+            return super().get_special_field(col_guess, row, file_manager)
+
     class OrderFileManager(FileManager):
         REQUIRED_HEADERS = [
             'Quantity',
@@ -625,9 +625,6 @@ class PurchaseOrderUpload(FileManagementFormView):
         ]
 
     name = 'order'
-    form_list_override = [
-        ('items', OrderMatchItem),
-    ]
     form_steps_template = [
         'order/order_wizard/po_upload.html',
         'order/order_wizard/match_fields.html',
@@ -647,6 +644,10 @@ class PurchaseOrderUpload(FileManagementFormView):
     }
     file_manager_class = OrderFileManager
 
+    def __init__(self, *args, **kwargs):
+        self.forms['items'] = self.OrderMatchItem
+        return super().__init__(*args, **kwargs)
+
     def get_order(self):
         """ Get order or return 404 """