diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/CollectionLeafResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/CollectionLeafResource.java
index cc957b547f7..a13de44f46d 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/CollectionLeafResource.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/CollectionLeafResource.java
@@ -352,12 +352,10 @@ private Map<String, String> processData(Map<String, String> data, boolean remove
             if ("target".equals(key) || "profiler".equals(key)) {
                 results.put(key, entry.getValue());
             } else {
-//                options.append(sep).append(escapeOptionPart(entry.getKey()));
-                options.append(sep).append(removeVersioning ? new JvmOption(key).option: key);
+                options.append(sep).append(removeVersioning ? new JvmOption(key).option : key);
 
                 String value = entry.getValue();
-                if ((value != null) && (!value.isEmpty())) {
-//                    options.append("=").append(escapeOptionPart(entry.getValue()));
+                if (value != null && !value.isEmpty() || key != null && key.startsWith("-D")) {
                     options.append("=").append(entry.getValue());
                 }
                 sep = ":";