diff --git a/pve-docs/api-viewer/apidoc.js.patch b/pve-docs/api-viewer/apidoc.js.patch
index 346ad80..22b7c6c 100644
--- a/pve-docs/api-viewer/apidoc.js.patch
+++ b/pve-docs/api-viewer/apidoc.js.patch
@@ -1,17 +1,17 @@
---- /usr/share/pve-docs/api-viewer/apidoc.js.orig	2018-06-04 12:08:17.416780601 +0800
-+++ /usr/share/pve-docs/api-viewer/apidoc.js	2018-06-04 12:07:28.073832212 +0800
-@@ -27549,6 +27549,24 @@
+--- apidoc.js   2018-07-10 06:05:33.000000000 -0400
++++ apidoc.js.new       2018-07-30 22:21:11.479045222 -0400
+@@ -27584,6 +27584,24 @@
                             "type" : "string",
                             "typetext" : "<string>"
                          },
 +                        "freenas_user" : {
-+                           "description" : "FreeNAS user for API calls",
++                           "description" : "FreeNAS user for API access",
 +                           "optional" : 1,
 +                           "type" : "string",
 +                           "typetext" : "<string>"
 +                        },
 +                        "freenas_password" : {
-+                           "description" : "FreeNAS password for API calls",
++                           "description" : "FreeNAS password for API access",
 +                           "optional" : 1,
 +                           "type" : "string",
 +                           "typetext" : "<string>"
@@ -25,18 +25,18 @@
                          "content" : {
                             "description" : "Allowed content types.\n\nNOTE: the value 'rootdir' is used for Containers, and value 'images' for VMs.\n",
                             "format" : "pve-storage-content-list",
-@@ -27896,6 +27914,24 @@
+@@ -27949,6 +27967,24 @@
                       "type" : "string",
                       "typetext" : "<string>"
                    },
 +                  "freenas_user" : {
-+                     "description" : "FreeNAS user for API calls",
++                     "description" : "FreeNAS user for API access",
 +                     "optional" : 1,
 +                     "type" : "string",
 +                     "typetext" : "<string>"
 +                  },
 +                  "freenas_password" : {
-+                     "description" : "FreeNAS password for API calls",
++                     "description" : "FreeNAS password for API access",
 +                     "optional" : 1,
 +                     "type" : "string",
 +                     "typetext" : "<string>"
diff --git a/pve-manager/js/pvemanagerlib.js.patch b/pve-manager/js/pvemanagerlib.js.patch
index 394c485..52a36da 100644
--- a/pve-manager/js/pvemanagerlib.js.patch
+++ b/pve-manager/js/pvemanagerlib.js.patch
@@ -1,38 +1,66 @@
---- /usr/share/pve-manager/js/pvemanagerlib.js.orig	2018-06-04 11:21:26.419121310 +0800
-+++ /usr/share/pve-manager/js/pvemanagerlib.js	2018-06-04 11:52:58.628592707 +0800
-@@ -5356,6 +5356,7 @@
+--- pvemanagerlib.js    2018-07-10 08:46:32.000000000 -0400
++++ pvemanagerlib.js.new        2018-07-30 22:19:23.207915760 -0400
+@@ -5379,6 +5379,7 @@
      alias: ['widget.pveiScsiProviderSelector'],
      comboItems: [
- 	['comstar', 'Comstar'],
-+	['freenas', 'FreeNAS-API'],
- 	[ 'istgt', 'istgt'],
- 	[ 'iet', 'IET']
+        ['comstar', 'Comstar'],
++       ['freenas', 'FreeNAS-API'],
+        [ 'istgt', 'istgt'],
+        [ 'iet', 'IET']
      ]
-@@ -27343,6 +27344,27 @@
- 		value: '',
- 		fieldLabel: gettext('Target group'),
- 		allowBlank: true
-+	    },
-+	    {
-+		xtype: me.isCreate ? 'textfield' : 'displayfield',
-+		name: 'freenas_user',
-+		value: '',
-+		fieldLabel: gettext('FreeNAS User'),
-+		allowBlank: true
-+	    },
-+	    {
-+		xtype: me.isCreate ? 'textfield' : 'displayfield',
-+		name: 'freenas_password',
-+		value: '',
-+		fieldLabel: gettext('FreeNAS Password'),
-+		allowBlank: true
-+	    },
-+	    {
-+		xtype: 'proxmoxcheckbox',
-+		name: 'freenas_use_ssl',
-+		checked: false,
-+		uncheckedValue: 0,
-+		fieldLabel: gettext('FreeNAS API use SSL')
- 	    }
- 	];
- 
+@@ -27361,6 +27362,30 @@
+                value: '',
+                fieldLabel: gettext('Target group'),
+                allowBlank: true
++           },
++           {
++               xtype: me.isCreate ? 'textfield' : 'displayfield',
++               name: 'freenas_user',
++               value: '',
++               hidden: me.iscsiprovider !== "freenas",
++               fieldLabel: gettext('FreeNAS User'),
++               allowBlank: true
++           },
++           {
++               xtype: me.isCreate ? 'textfield' : 'displayfield',
++               name: 'freenas_password',
++               value: '',
++               hidden: me.iscsiprovider !== "freenas",
++               fieldLabel: gettext('FreeNAS Password'),
++               allowBlank: true
++           },
++           {
++               xtype: 'proxmoxcheckbox',
++               name: 'freenas_use_ssl',
++               checked: false,
++               uncheckedValue: 0,
++               hidden: me.iscsiprovider !== "freenas",
++               fieldLabel: gettext('FreeNAS API use SSL')
+            }
+        ];
+
+@@ -27370,7 +27395,23 @@
+                name: 'iscsiprovider',
+                value: 'comstar',
+                fieldLabel: gettext('iSCSI Provider'),
+-               allowBlank: false
++               allowBlank: false,
++               listeners: {
++                       change: function(f, value) {
++                               if (value === "freenas") {
++                                       me.down('field[name=freenas_user]').setHidden(false);
++                                       me.down('field[name=freenas_password]').setHidden(false);
++                                       me.down('field[name=freenas_use_ssl]').setHidden(false);
++                               } else {
++                                       me.down('field[name=freenas_user]').setHidden(true);
++                                       me.down('field[name=freenas_user]').setValue('');
++                                       me.down('field[name=freenas_password]').setHidden(true);
++                                       me.down('field[name=freenas_password]').setValue('');
++                                       me.down('field[name=freenas_use_ssl]').setHidden(true);
++                                       me.down('field[name=freenas_use_ssl]').setValue(false);
++                               }
++                       }
++               }
+            },
+            {
+                xtype: 'proxmoxcheckbox',