diff --git a/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb b/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb
index 2632bdb..7671a07 100644
--- a/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb
+++ b/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb
@@ -24,19 +24,18 @@ host_config:
     sql_username: "ejabberd"
     sql_password: "<%= @pgsql_password %>"
 
+<% if (File.exist?("/opt/ejabberd/conf/kosmos.org.crt") && File.exist?("/opt/ejabberd/conf/kosmos.org.key")) ||
+    (File.exist?("/opt/ejabberd/conf/5apps.com.crt") && File.exist?("/opt/ejabberd/conf/5apps.com.key")) -%>
 certfiles:
-<% if File.exist?("/opt/ejabberd/conf/kosmos.org.crt") -%>
+<% if File.exist?("/opt/ejabberd/conf/kosmos.org.crt") && File.exist?("/opt/ejabberd/conf/kosmos.org.key") -%>
   - "/opt/ejabberd/conf/kosmos.org.crt"
-<% end -%>
-<% if File.exist?("/opt/ejabberd/conf/kosmos.org.key") -%>
   - "/opt/ejabberd/conf/kosmos.org.key"
 <% end -%>
-<% if File.exist?("/opt/ejabberd/conf/5apps.com.crt") -%>
+<% if File.exist?("/opt/ejabberd/conf/5apps.com.crt") && File.exist?("/opt/ejabberd/conf/5apps.com.key") -%>
   - "/opt/ejabberd/conf/5apps.com.crt"
-<% end -%>
-<% if File.exist?("/opt/ejabberd/conf/5apps.com.key") -%>
   - "/opt/ejabberd/conf/5apps.com.key"
 <% end -%>
+<% end -%>
 
 ca_file: "/opt/ejabberd/conf/cacert.pem"