Index: admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/custom/SystemPropertiesCliResource.java
===================================================================
--- admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/custom/SystemPropertiesCliResource.java	(revision 47553)
+++ admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/custom/SystemPropertiesCliResource.java	(working copy)
@@ -145,7 +145,7 @@
                 }
             }
         }
-        
+
         getSystemProperties(properties, getEntity(), false);
 
         actionReport.getExtraProperties().put("systemProperties", new ArrayList(properties.values()));
@@ -187,7 +187,7 @@
 
         return deleteProperty(grandParent, id);
     }
-    
+
     protected void getSystemProperties(Map<String, Map<String, String>> properties, Dom dom, boolean getDefaults) {
         List<Dom> sysprops = dom.nodeElements("system-property");
         if ((sysprops != null) && (!sysprops.isEmpty())) {
@@ -211,7 +211,7 @@
                 }
             }
         }
-        
+
         // Figure out how to recurse
         if (dom.getProxyType().equals(Server.class)) {
 //            Server server = (Server) spb;
@@ -226,7 +226,7 @@
             getSystemProperties(properties, getConfig(dom.parent().parent(), dom.attribute("config-ref")), true);
         }
     }
-    
+
     protected Dom getCluster(Dom domain, String clusterName) {
         List<Dom> configs = domain.nodeElements("clusters").get(0).nodeElements("cluster");
         for(Dom config : configs) {
@@ -236,7 +236,7 @@
         }
         return null;
     }
-    
+
     protected Dom getConfig(Dom domain, String configName) {
         List<Dom> configs = domain.nodeElements("configs").get(0).nodeElements("config");
         for(Dom config : configs) {
@@ -253,7 +253,10 @@
         for (Map.Entry<String, String> entry : data.entrySet()) {
             final String value = entry.getValue();
             if ((value != null) && !value.isEmpty()) {
-                options.append(sep).append(entry.getKey()).append("=").append(value.replaceAll(":", "\\\\:"));
+                options.append(sep)
+                        .append(entry.getKey())
+                        .append("=")
+                        .append(value.replaceAll(":", "\\\\:").replaceAll("=", "\\\\="));
                 sep = ":";
             }
         }
Index: admingui/devtests/src/test/java/org/glassfish/admingui/devtests/StandaloneTest.java
===================================================================
--- admingui/devtests/src/test/java/org/glassfish/admingui/devtests/StandaloneTest.java	(revision 47559)
+++ admingui/devtests/src/test/java/org/glassfish/admingui/devtests/StandaloneTest.java	(working copy)
@@ -87,7 +87,7 @@
     public void testCreateStartStopAndDeleteStandaloneInstance() {
         String instanceName = INSTANCE_PREFIX + generateRandomString();
         createStandAloneInstance(instanceName);
-        
+
         String prefix = getTableRowByValue(ID_INSTANCE_TABLE, instanceName, "col1");
         assertTrue(isTextPresent(instanceName));
         assertEquals(instanceName, getText(prefix + "col1:link"));
@@ -114,7 +114,7 @@
         clickAndWait(ID_INSTANCE_PROP_TAB, TRIGGER_SYS_PROPS);
         int sysPropCount = addTableRow("propertyForm:sysPropsTable", "propertyForm:sysPropsTable:topActionsGroup1:addSharedTableButton");
         setFieldValue("propertyForm:sysPropsTable:rowGroup1:0:col2:col1St", "property"+generateRandomString());
-        setFieldValue("propertyForm:sysPropsTable:rowGroup1:0:overrideValCol:overrideVal", "value");
+        setFieldValue("propertyForm:sysPropsTable:rowGroup1:0:overrideValCol:overrideVal", "foo=bar");
         // FIXME: The app needs to be fixed here. should show success message
         clickAndWait("propertyForm:clusterSysPropsPage:topButtons:topButtons:saveButton", TRIGGER_SYS_PROPS);
         sleep(1000); // grr! FIXME
@@ -125,7 +125,7 @@
 
         int instancePropCount = addTableRow("propertyForm:basicTable", "propertyForm:basicTable:topActionsGroup1:addSharedTableButton");
         setFieldValue("propertyForm:basicTable:rowGroup1:0:col2:col1St", "property"+generateRandomString());
-        setFieldValue("propertyForm:basicTable:rowGroup1:0:col3:col1St", "value");
+        setFieldValue("propertyForm:basicTable:rowGroup1:0:col3:col1St", "foo=bar");
         clickAndWait("propertyForm:propertyContentPage:topButtons:saveButton", TRIGGER_NEW_VALUES_SAVED);
 
         // Verify that properties were persisted
@@ -174,7 +174,7 @@
 
         jdbcTest.deleteJDBCResource(jndiName, target, MonitoringTest.TARGET_STANDALONE_TYPE);
     }
-    
+
     public void createStandAloneInstance(String instanceName){
         gotoStandaloneInstancesPage();
         clickAndWait(ID_INSTANCE_TABLE_NEW_BUTTON, TRIGGER_NEW_PAGE );
@@ -198,14 +198,14 @@
         if (getTableRowCount(ID_INSTANCE_TABLE) == 0) {
             return;
         }
-        
+
         this.selectAllTableRows(ID_INSTANCE_TABLE);
         chooseOkOnNextConfirmation();
         pressButton("propertyForm:instancesTable:topActionsGroup1:button3");
         waitForButtonDisabled("propertyForm:instancesTable:topActionsGroup1:button3");
         getConfirmation();
-        
 
+
         /*
         // Stop all instances
         if (selectTableRowsByValue(ID_INSTANCE_TABLE, STATUS_RUNNING, "col0", "col6") > 0) {