Index: admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/ServiceAdapter.java
===================================================================
--- admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/ServiceAdapter.java	(revision 43921)
+++ admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/ServiceAdapter.java	(working copy)
@@ -118,7 +118,7 @@
         if (OS.isWindowsForSure() && !LINUX_HACK) {
             // Windows doesn't respond well to slashes in the name!!
             getTokenMap().put(SERVICE_NAME_TN, info.serviceName);
-            getTokenMap().put(ENTITY_NAME_TN, info.serviceName);
+            getTokenMap().put(ENTITY_NAME_TN, serverName);
         }
         else
             getTokenMap().put(SERVICE_NAME_TN, info.smfFullServiceName);