diff --git a/views/productform.blade.php b/views/productform.blade.php
index 15d7ae4e..08a22798 100644
--- a/views/productform.blade.php
+++ b/views/productform.blade.php
@@ -369,7 +369,8 @@
 
 			<small class="my-2 form-text text-muted @if($mode == 'edit') d-none @endif">{{ $__t('Save & continue to add quantity unit conversions & barcodes') }}</small>
 
-			<button class="save-product-button btn btn-success mb-2"
+			<button id="save-product-button"
+				class="save-product-button btn btn-success mb-2"
 				data-location="continue">{{ $__t('Save & continue') }}</button>
 			<button class="save-product-button btn btn-info mb-2"
 				data-location="return">{{ $__t('Save & return to products') }}</button>
diff --git a/views/quantityunitconversionform.blade.php b/views/quantityunitconversionform.blade.php
index 3c2f52b3..fe6c68b7 100644
--- a/views/quantityunitconversionform.blade.php
+++ b/views/quantityunitconversionform.blade.php
@@ -100,9 +100,16 @@
 					<input type="hidden"
 						name="create_inverse:skip"
 						value="0">
-					<input @if($mode=='edit'
+					<input @if($mode=='create'
 						&&
-						$product->create_inverse == 1) checked @endif class="form-check-input custom-control-input" type="checkbox" id="create_inverse" name="create_inverse:skip" value="1">
+						$product==null)
+						checked
+						@endif
+						class="form-check-input custom-control-input"
+						type="checkbox"
+						id="create_inverse"
+						name="create_inverse:skip"
+						value="1">
 					<label class="form-check-label custom-control-label"
 						for="create_inverse">{{ $__t('Create inverse QU conversion') }}</label>
 					<span id="qu-conversion-inverse-info"