diff --git a/appserver/admingui/cluster/src/main/resources/cluster/clusterInstanceEdit.jsf b/appserver/admingui/cluster/src/main/resources/cluster/clusterInstanceEdit.jsf
index 4fb54110055..5d628011ee0 100644
--- a/appserver/admingui/cluster/src/main/resources/cluster/clusterInstanceEdit.jsf
+++ b/appserver/admingui/cluster/src/main/resources/cluster/clusterInstanceEdit.jsf
@@ -47,7 +47,7 @@
     setResourceBundle(key="help_cluster" bundle="org.glassfish.cluster.admingui.Helplinks");
 />
 <!composition template="/templates/default.layout"  guiTitle="  $resource{i18ncs.clusterInstance.PageTitle}"
-    guiOnLoad="admingui.nav.selectTreeNodeWithURL('#{request.contextPath}/cluster/cluster/clusterGeneral.jsf?clusterName=#{pageSession.clusterName}');">
+    guiOnLoad="admingui.nav.selectTreeNodeWithURL('#{request.contextPath}/cluster/cluster/clusterGeneral.jsf?clusterName=#{pageSession.encodedClusterName}');">
 #include "/cluster/shared/handlers.inc"
 <!define name="content">
     <event>
diff --git a/appserver/admingui/common/src/main/resources/applications/appEdit.layout b/appserver/admingui/common/src/main/resources/applications/appEdit.layout
index a4667b79217..a2415c899cf 100644
--- a/appserver/admingui/common/src/main/resources/applications/appEdit.layout
+++ b/appserver/admingui/common/src/main/resources/applications/appEdit.layout
@@ -46,7 +46,7 @@
 />
 <!composition template="/templates/default.layout"  guiTitle="$resource{i18n.enterpriseApplications.editPageTitle}"
     guiTemplateOnLoad="admingui.help.pluginId = 'common';"
-    guiOnLoad="admingui.nav.selectTreeNodeWithURL('#{request.contextPath}/common/applications/applicationEdit.jsf?appName=#{pageSession.appName}');"
+    guiOnLoad="admingui.nav.selectTreeNodeWithURL('#{request.contextPath}/common/applications/applicationEdit.jsf?appName=#{pageSession.encodedAppName}');"
 >
 <!define name="content">
     <event>
diff --git a/appserver/admingui/common/src/main/resources/applications/lifecycleTargetListing.jsf b/appserver/admingui/common/src/main/resources/applications/lifecycleTargetListing.jsf
index 3280c6033fd..0fc309e797d 100644
--- a/appserver/admingui/common/src/main/resources/applications/lifecycleTargetListing.jsf
+++ b/appserver/admingui/common/src/main/resources/applications/lifecycleTargetListing.jsf
@@ -46,7 +46,7 @@
 />
 <!composition template="/templates/default.layout"
     guiTitle="$resource{i18n.lifecycleTargetListing.PageTitle}"
-    guiOnLoad="admingui.nav.selectTreeNodeWithURL('#{request.contextPath}/common/applications/lifecycleEdit.jsf?appName=#{pageSession.appName}');"
+    guiOnLoad="admingui.nav.selectTreeNodeWithURL('#{request.contextPath}/common/applications/lifecycleEdit.jsf?appName=#{pageSession.encodedName}');"
 
 >
 <!define name="content">
diff --git a/appserver/admingui/common/src/main/resources/applications/targetListing.jsf b/appserver/admingui/common/src/main/resources/applications/targetListing.jsf
index c2722318150..c4d4e81ffe8 100644
--- a/appserver/admingui/common/src/main/resources/applications/targetListing.jsf
+++ b/appserver/admingui/common/src/main/resources/applications/targetListing.jsf
@@ -49,7 +49,7 @@
 />
 <!composition template="/templates/default.layout"
     guiTitle="$resource{i18n.applicationTargetListing.PageTitle}"
-    guiOnLoad="admingui.nav.selectTreeNodeWithURL('#{request.contextPath}/common/applications/applicationEdit.jsf?appName=#{pageSession.appName}');"
+    guiOnLoad="admingui.nav.selectTreeNodeWithURL('#{request.contextPath}/common/applications/applicationEdit.jsf?appName=#{pageSession.encodedAppName}');"
 >
 <!define name="content">
     <event>
diff --git a/appserver/admingui/common/src/main/resources/applications/webDDEdit.jsf b/appserver/admingui/common/src/main/resources/applications/webDDEdit.jsf
index 38234741715..405859dec7c 100644
--- a/appserver/admingui/common/src/main/resources/applications/webDDEdit.jsf
+++ b/appserver/admingui/common/src/main/resources/applications/webDDEdit.jsf
@@ -46,7 +46,7 @@
 />
 <!-- applications/webDDEdit.jsf -->
 <!composition template="/templates/default.layout"  guiTitle="$resource{i18n.enterpriseApplications.descriptorPageTitle}"
-    guiOnLoad="admingui.nav.selectTreeNodeWithURL('#{request.contextPath}/common/applications/applicationEdit.jsf?appName=#{pageSession.appName}');"
+    guiOnLoad="admingui.nav.selectTreeNodeWithURL('#{request.contextPath}/common/applications/applicationEdit.jsf?appName=#{pageSession.encodedAppName}');"
 >
 <!define name="content">
 #include "/common/applications/applicationHandlers.inc"
diff --git a/appserver/admingui/common/src/main/resources/configuration/configuration.jsf b/appserver/admingui/common/src/main/resources/configuration/configuration.jsf
index acd9e035039..c486b1b1d06 100644
--- a/appserver/admingui/common/src/main/resources/configuration/configuration.jsf
+++ b/appserver/admingui/common/src/main/resources/configuration/configuration.jsf
@@ -46,11 +46,12 @@
     setResourceBundle(key="help_common" bundle="org.glassfish.common.admingui.Helplinks");
 />
 <!composition template="/templates/default.layout"  guiTitle="$resource{i18n.configuration.pageTitle}"
-    guiOnLoad="admingui.nav.selectTreeNodeWithURL('#{request.contextPath}/common/configuration/configuration.jsf?configName=#{pageSession.configName}');" >
+    guiOnLoad="admingui.nav.selectTreeNodeWithURL('#{request.contextPath}/common/configuration/configuration.jsf?configName=#{pageSession.encodedConfigName}');" >
 <!define name="content">
     <event>
         <!beforeCreate
             getRequestValue(key="configName" value="#{pageSession.configName}");
+            urlencode(value="#{pageSession.configName}" encoding="UTF-8" result="#{pageSession.encodedConfigName}");
         />
     </event>
     <sun:form id="configForm">