diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLClientConfigurator.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLClientConfigurator.java
index eb81654194f..3e4020fefc6 100644
--- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLClientConfigurator.java
+++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLClientConfigurator.java
@@ -143,7 +143,7 @@ public SSLContext configure(SSLParams sslParams) {
        // Certificate encoding algorithm (e.g., SunX509)
        String algorithm = sslParams.getKeyAlgorithm();
        if (algorithm == null) {
-            algorithm = "SunX509";
+            algorithm = KeyManagerFactory.getDefaultAlgorithm();
        }
 
        String keyAlias = sslParams.getCertNickname();