Index: src/main/java/com/sun/enterprise/v3/admin/AdminConsoleConfigUpgrade.java
===================================================================
--- src/main/java/com/sun/enterprise/v3/admin/AdminConsoleConfigUpgrade.java	(revision 41929)
+++ src/main/java/com/sun/enterprise/v3/admin/AdminConsoleConfigUpgrade.java	(working copy)
@@ -42,7 +42,7 @@
 
 import com.sun.enterprise.config.serverbeans.*;
 import com.sun.enterprise.util.EarlyLogger;
-import com.sun.grizzly.config.dom.NetworkListener;
+import com.sun.grizzly.config.dom.*;
 import org.glassfish.api.admin.config.ConfigurationUpgrade;
 import org.jvnet.hk2.annotations.Inject;
 import org.jvnet.hk2.annotations.Service;
@@ -108,19 +108,44 @@
                 continue;
             }
             SecurityService s = config.getSecurityService();
-            if (s == null) {
-                continue;
+            if (s != null) {
+                try {
+                    ConfigSupport.apply(new AdminConsoleConfigCode(), s);
+                } catch (TransactionFailure tf) {
+                    EarlyLogger.add(Level.SEVERE,
+                        "Could not upgrade security service for admin console: " +
+                            tf);
+                }
             }
-            try {
-                ConfigSupport.apply(new AdminConsoleConfigCode(), s);
-            } catch (TransactionFailure tf) {
-                EarlyLogger.add(Level.SEVERE,
-                    "Could not upgrade security service for admin console: " +
-                    tf);
+            Protocols ps = config.getNetworkConfig().getProtocols();
+            if (ps != null) {
+                for (Protocol p : ps.getProtocol()) {
+                    Http h = p.getHttp();
+                    if (h != null &&
+                        "__asadmin".equals(h.getDefaultVirtualServer())) {
+                        try {
+                            ConfigSupport.apply(new HttpConfigCode(), h);
+                        } catch (TransactionFailure tf) {
+                            EarlyLogger.add(Level.SEVERE,
+                                "Could not upgrade http element for admin console: " +
+                                    tf);
+                        }
+                    }
+                }
             }
         }
     }
 
+    private class HttpConfigCode implements  SingleConfigCode<Http> {
+        @Override
+        public Object run(Http http) throws PropertyVetoException,
+            TransactionFailure {
+
+            http.setEncodedSlashEnabled("true");
+            return null;
+        }
+    }
+
     private class AdminConsoleConfigCode
         implements SingleConfigCode<SecurityService> {