diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 2ee9a21e3d3..51179d37750 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -3967,7 +3967,7 @@
                       array1.push("&internaldns1=" + todb(args.data.internaldns1));
                       array1.push("&internaldns2=" + todb(args.data.internaldns2));  //internaldns2 can be empty ("") when passed to API
                       array1.push("&domain=" + todb(args.data.domain));
-                      array1.push("&localstorageenabled=" + todb(args.data.localstorageenabled));
+                      array1.push("&localstorageenabled=" + (args.data.localstorageenabled == 'on'));
                       $.ajax({
                         url: createURL("updateZone&id=" + args.context.physicalResources[0].id + array1.join("")),
                         dataType: "json",
@@ -4014,13 +4014,9 @@
                         },
                         localstorageenabled: {
                           label: 'label.local.storage.enabled',
-                          converter: function(args) {
-                            if(args)
-                              return "true";
-                            else
-                              return "false";
-                          },
-                          isEditable: true
+                          isBoolean: true,
+													isEditable: true,
+													converter:cloudStack.converters.toBooleanText
                         }
                       }
                     ],