diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 1eefd00d4df..3d1380a046c 100644
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -437,7 +437,7 @@ public class ConfigurationServerImpl implements ConfigurationServer {
 
         String o = ou;
         String c = "Unknown";
-        String dname = "cn=" + cn + ", ou=" + ou +", o=" + o + ", c=" + c;
+        String dname = "cn=\"" + cn + "\",ou=\"" + ou +"\",o=\"" + o + "\",c=\"" + c + "\"";
         Script script = new Script(true, "keytool", 5000, null);
         script.add("-genkey");
         script.add("-keystore", keystorePath);