Index: core/kernel/src/main/java/com/sun/enterprise/v3/admin/IdmService.java
===================================================================
--- core/kernel/src/main/java/com/sun/enterprise/v3/admin/IdmService.java	(revision 33489)
+++ core/kernel/src/main/java/com/sun/enterprise/v3/admin/IdmService.java	(working copy)
@@ -98,6 +98,8 @@
         //if (!success)
             //logger.warning("THIS SHOULD BE FIXED, IN EMBEDDED CASE, THERE IS NO MASTER PASSWORD SET OR KEYSTORE DOES NOT EXIST ...");
         setJSSEProperties();
+        // Patch through to old code
+        com.sun.enterprise.security.store.IdentityManager.setMasterPassword(masterPassword);
     }
 
     private void setJSSEProperties() {
Index: common/common-util/src/main/java/com/sun/enterprise/security/store/IdentityManager.java
===================================================================
--- common/common-util/src/main/java/com/sun/enterprise/security/store/IdentityManager.java	(revision 33489)
+++ common/common-util/src/main/java/com/sun/enterprise/security/store/IdentityManager.java	(working copy)
@@ -300,7 +300,10 @@
         }
     }
 
-    
+    public static void setMasterPassword(char[] passwd) {
+        _masterPassword = new String(passwd);
+    }
+
     public static String getMasterPassword() {
         return _masterPassword;
     }
Index: common/common-util/src/main/java/com/sun/enterprise/util/RelativePathResolver.java
===================================================================
--- common/common-util/src/main/java/com/sun/enterprise/util/RelativePathResolver.java	(revision 33489)
+++ common/common-util/src/main/java/com/sun/enterprise/util/RelativePathResolver.java	(working copy)
@@ -378,7 +378,6 @@
         }
         final String          an = RelativePathResolver.getAlias(at);
         String          sp = IdentityManager.getMasterPassword();
-        if (sp == null) { sp = "changeit";}
         final PasswordAdapter pa = new PasswordAdapter(sp.toCharArray()); // use default password store
         final boolean     exists = pa.aliasExists(an);
         if (!exists) {
@@ -387,8 +386,6 @@
             throw new IllegalArgumentException(msg);
         }
         final String real = pa.getPasswordForAlias(an);
-        System.out.println(
-            "#################### Password for the alias: " + an + " is "+real);
         return ( real );
     }    
 }