diff -Nur --no-dereference e-smith-base-5.8.0.old/root/etc/e-smith/templates/etc/openssl.conf/05config e-smith-base-5.8.0/root/etc/e-smith/templates/etc/openssl.conf/05config
--- e-smith-base-5.8.0.old/root/etc/e-smith/templates/etc/openssl.conf/05config	2021-04-21 21:53:02.302000000 -0400
+++ e-smith-base-5.8.0/root/etc/e-smith/templates/etc/openssl.conf/05config	2021-04-21 22:07:28.948000000 -0400
@@ -8,9 +8,9 @@
     our $commonName = $modSSL{CommonName} || $FQDN;
     our $crt = "/home/e-smith/ssl.crt/$FQDN.crt";
     our $key = "/home/e-smith/ssl.key/$FQDN.key";
-    our $defaultCity = $ldap{defaultCity};
-    our $defaultCompany = $ldap{defaultCompany};
-    our $defaultDepartment = $ldap{defaultDepartment};
+    our $defaultCity = $ldap{defaultCity} || '-';
+    our $defaultCompany = $ldap{defaultCompany} || $commonName ;
+    our $defaultDepartment = $ldap{defaultDepartment} || '-';
     our $email = "admin\@$DomainName";
     our @subjectAlt = `/sbin/e-smith/generate-subjectaltnames`;
     chomp @subjectAlt;