diff --git a/Makefile b/Makefile
index cc51d1781074a5247d8ac472b79087d9c40d2de4..066af11f2298cd7a92f65ad814ff368a13c7a7a7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 BASE=ordernumber
 PLUGINTYPE=vmshopper
-VERSION=3.5
+VERSION=3.6
 
 PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html $(BASE)/
 
diff --git a/ordernumber.php b/ordernumber.php
index c07588bb80c1f4970ba04b18f2b3e95456c179bc..5d328f3d8d7b4b49a5a12cd051f12235625bdcbb 100644
--- a/ordernumber.php
+++ b/ordernumber.php
@@ -493,7 +493,7 @@ class plgVmShopperOrdernumber extends vmShopperPlugin {
                 // numeric means we have the old behavor pre-3.0.12 => No invoice_pass to check
                 $invoice_pass = 1;
             } else {
-                $invoice_pass = isset($orderDetails['order_create_invoice_pass']) ? $orderDetails['order_create_invoice_pass'] : 'DO_NOT_CREATE_INVOICE';
+                $invoice_pass = isset($orderDetails['order_create_invoice_pass']) ? $orderDetails['order_create_invoice_pass'] : '';
             }
 
             if ( in_array($orderDetails['order_status'],$orderstatusForInvoice)  or $pdfInvoice==1  or $force_create_invoice==$invoice_pass ){
diff --git a/ordernumber.xml b/ordernumber.xml
index 9e0194d8ecca8f03e33169edc61009b7cae08de9..4cc89a4a804753a70c296fbbe502897cefdf5321 100644
--- a/ordernumber.xml
+++ b/ordernumber.xml
@@ -7,7 +7,7 @@
     <authorUrl>http://www.open-tools.net/</authorUrl>
     <copyright>Copyright (C) 2012-2015 Reinhold Kainhofer. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-3.0.html GNU/GPLv3</license>
-    <version>3.5</version>
+    <version>3.6</version>
     <releaseDate>2015-05-23</releaseDate>
     <releaseType>Minor update</releaseType>
     <downloadUrl>http://open-tools.net/virtuemart/advanced-ordernumbers.html</downloadUrl>
diff --git a/releases/plg_vmshopper_ordernumber_v3.6.zip b/releases/plg_vmshopper_ordernumber_v3.6.zip
new file mode 100644
index 0000000000000000000000000000000000000000..1a45c968bfc7efc0e3ab1d3fd15dde32fec77705
Binary files /dev/null and b/releases/plg_vmshopper_ordernumber_v3.6.zip differ