diff --git a/Makefile b/Makefile
index 16832ebb0e56515a352014bf2940e2cb5ebfdbac..38addfd5afd0bef9287e7c625ac1c0f034a69a71 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 BASE=ordernumber
 PLUGINTYPE=vmshopper
-VERSION=1.6
+VERSION=1.6.1
 
-PLUGINFILES=$(BASE).php $(BASE).xml index.html
+PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html
 # TRANSDIR=../../../administrator/language/
 # TRANSLATIONS=$(call wildcard,$(TRANSDIR)/*/*.plg_$(PLUGINTYPE)_$(BASE).sys.ini)
 TRANSLATIONS=$(call wildcard,language/*/*.plg_$(PLUGINTYPE)_$(BASE).sys.ini) language/index.html $(call wildcard,language/**/index.html)
diff --git a/ordernumber.php b/ordernumber.php
index 975959aad926f0a4e5401b362761e253c7ff710f..ea08c7797ff5e07791be18653e0f12c30ff5efd0 100644
--- a/ordernumber.php
+++ b/ordernumber.php
@@ -106,7 +106,7 @@ class plgVmShopperOrdernumber extends vmShopperPlugin {
     function plgVmOnUpdateOrderBEShopper($_orderID) {}
 
     /* Replace the format variables, match[1] is the variable name, match[2] and match[3] are only used for random fields */
-    /* Type 0 means order number, type 1 means invoice number, type 2 means customer number */
+    /* Type 0 means order number, type 1 means invoice number, type 2 means customer number, 3 means order password */
     function replace_fields ($fmt, $nrtype, $details) {
         // Match variables for the form random[type][count] and everything else.
         // This makes it possible to handle "random" just like any other type!
@@ -172,7 +172,7 @@ class plgVmShopperOrdernumber extends vmShopperPlugin {
         // Is order password customization enabled?
         if ($this->params->get('customize_order_password')) {
           $fmt = $this->params->get ('order_password_format', "[randomHex8]");
-          $passwd = $this->replace_fields ($fmt, $orderDetails);
+          $passwd = $this->replace_fields ($fmt, 3, $orderDetails);
           $orderDetails->order_pass = $passwd;
         }
     }
diff --git a/ordernumber.script.php b/ordernumber.script.php
new file mode 100644
index 0000000000000000000000000000000000000000..d7146b75e23a3e552de540a67c21ecb2e0b0b514
--- /dev/null
+++ b/ordernumber.script.php
@@ -0,0 +1,77 @@
+<?php
+defined('_JEXEC') or die('Restricted access');
+
+class plgVmShopperOrdernumberInstallerScript
+{
+    /**
+     * Constructor
+     *
+     * @param   JAdapterInstance  $adapter  The object responsible for running this script
+     */
+//     public function __constructor(JAdapterInstance $adapter);
+ 
+    /**
+     * Called before any type of action
+     *
+     * @param   string  $route  Which action is happening (install|uninstall|discover_install)
+     * @param   JAdapterInstance  $adapter  The object responsible for running this script
+     *
+     * @return  boolean  True on success
+     */
+//     public function preflight($route, JAdapterInstance $adapter);
+ 
+    /**
+     * Called after any type of action
+     *
+     * @param   string  $route  Which action is happening (install|uninstall|discover_install)
+     * @param   JAdapterInstance  $adapter  The object responsible for running this script
+     *
+     * @return  boolean  True on success
+     */
+//     public function postflight($route, JAdapterInstance $adapter);
+ 
+    /**
+     * Called on installation
+     *
+     * @param   JAdapterInstance  $adapter  The object responsible for running this script
+     *
+     * @return  boolean  True on success
+     */
+    public function install(JAdapterInstance $adapter)
+    {
+        // enabling plugin
+        $db =& JFactory::getDBO();
+        $db->setQuery('update #__extensions set enabled = 1 where type = "plugin" and element = "ordernumber" and folder = "vmshopper"');
+        $db->query();
+        
+        return True;
+    }
+ 
+    /**
+     * Called on update
+     *
+     * @param   JAdapterInstance  $adapter  The object responsible for running this script
+     *
+     * @return  boolean  True on success
+     */
+    public function update(JAdapterInstance $adapter)
+    {
+        jimport( 'joomla.filesystem.file' ); 
+        JFile::delete( JPATH_ROOT . DS . "administrator" . DS . "language" . DS . "en-GB" . DS . "en-GB.plg_vmshopper_ordernumber.sys.ini"); 
+        JFile::delete( JPATH_ROOT . DS . "administrator" . DS . "language" . DS . "de-DE" . DS . "de-DE.plg_vmshopper_ordernumber.sys.ini"); 
+        return true;
+    }
+ 
+    /**
+     * Called on uninstallation
+     *
+     * @param   JAdapterInstance  $adapter  The object responsible for running this script
+     */
+    public function uninstall(JAdapterInstance $adapter)
+    {
+        // Remove plugin table
+        $db =& JFactory::getDBO();
+        $db->setQuery('DROP TABLE `#__virtuemart_shopper_plg_ordernumber`;');
+        $db->query();
+    }
+}
\ No newline at end of file
diff --git a/ordernumber.xml b/ordernumber.xml
index bec61daf9f3a2f1b771361b87cf783513308d7be..ca874edca62946430b271d8615d234e4b9172482 100644
--- a/ordernumber.xml
+++ b/ordernumber.xml
@@ -7,7 +7,7 @@
     <authorUrl>http://www.kainhofer.com/</authorUrl>
     <copyright>Copyright (C) 2012-2013 Reinhold Kainhofer. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-3.0.html GNU/GPLv3</license>
-    <version>1.6.0</version>
+    <version>1.6.1</version>
     <releaseDate>2013-01-09</releaseDate>
     <releaseType>Minor update</releaseType>
     <downloadUrl>http://www.kainhofer.com/virtuemart-2-extensions/vm2-ordernumber-plugin.html</downloadUrl>
@@ -16,9 +16,11 @@
 
     <files>
         <filename plugin="ordernumber">ordernumber.php</filename>
-	<filename>index.html</filename>
+        <filename>ordernumber.script.php</filename>
+        <filename>index.html</filename>
         <folder>language</folder>
     </files>
+    <scriptfile>ordernumber.script.php</scriptfile>
     <config>
         <fields name="params">
             <fieldset name="basic">
diff --git a/releases/plg_vmshopper_ordernumber_v1.6.1.zip b/releases/plg_vmshopper_ordernumber_v1.6.1.zip
new file mode 100644
index 0000000000000000000000000000000000000000..90a116731b6c1a6873eb4ce9e559eccacd81dfc0
Binary files /dev/null and b/releases/plg_vmshopper_ordernumber_v1.6.1.zip differ