anchor.diff:          }
       }
       if (delete) {
  -        if (type != null && alias != null) {
  +        if (alias != null) {
               try {
  -                if (type.equals("server")) {
  -                    CertificateManager.deleteCertificate(keyStore, alias);
  -                } else if (type.equals("s2s")) {
  -                    CertificateManager.deleteCertificate(s2sTrustStore, alias);
  -                } else if (type.equals("c2s")) {
  -                    CertificateManager.deleteCertificate(c2sTrustStore, alias);
  -                } else {
  -                    throw new Exception("Unknown certificate type: " + type);
  -                }
  +                CertificateManager.deleteCertificate(keyStore, alias);
                   SSLConfig.saveStores();
                   // Log the event
                   webManager.logEvent("deleted SSL cert with alias " + alias, null);
  
positive.code:     <% if (offerUpdateIssuer) { %>
      <p>
          <fmt:message key="ssl.signing-request.offer-issuer-information">
              <fmt:param value="<%= "<a href='ssl-signing-request.jsp'>" %>"/>
              <fmt:param value="<%= "</a>" %>"/>
          </fmt:message>
      </p>
      <% } %>
  
negative.code: </c:forEach>
  <%
      if (keyStore != null) {
          if (keyStore.size() > 1 && !CertificateManager.isRSACertificate(keyStore, XMPPServer.getInstance().getServerInfo().getXMPPDomain())) {
  %>
  <admin:infobox type="warning"><fmt:message key="index.certificate-warning"/></admin:infobox>
  <%  } else if (keyStore.size() < 2) { %>
  