diff --git a/src/web/import-truststore-certificate.jsp b/src/web/import-truststore-certificate.jsp
index 3d6d2a034f88467ce4e85d640dc1a952c58b1ef2..e4605aaa262830c8c9a658e7b3c5e3b730c6e412 100644
--- a/src/web/import-truststore-certificate.jsp
+++ b/src/web/import-truststore-certificate.jsp
@@ -140,6 +140,7 @@
 
     <!-- BEGIN 'Import Certificate' -->
     <form action="import-truststore-certificate.jsp?connectionType=${connectionType}" method="post">
+        <input type="hidden" name="csrf" value="${csrf}">
         <fmt:message key="ssl.import.certificate.truststore.boxtitle" var="title"/>
         <admin:contentBox title="${title}">
             <table cellpadding="3" cellspacing="0" border="0">
diff --git a/src/web/security-truststore.jsp b/src/web/security-truststore.jsp
index ba87e383c1a1132be96a1486e83ecea942be0b37..f9273750645df36d6153ed025b218aafc4a89117 100644
--- a/src/web/security-truststore.jsp
+++ b/src/web/security-truststore.jsp
@@ -79,7 +79,7 @@
 
                     // Log the event
                     webManager.logEvent( "deleted SSL cert from " + connectionType + " with alias " + alias, null );
-                    response.sendRedirect( "security-keystore.jsp?connectionType=" + connectionType+ "&deletesuccess=true" );
+                    response.sendRedirect( "security-truststore.jsp?connectionType=" + connectionType+ "&deletesuccess=true" );
                     return;
                 }
                 catch ( Exception e )
@@ -221,7 +221,7 @@
                                         <c:out value="${certificate.publicKey.algorithm}"/>
                                     </td>
                                     <td width="1" align="center">
-                                        <a href="security-truststore.jsp?connectionType=${connectionType}&alias=${alias}&delete=true&csrf=csrf"
+                                        <a href="security-truststore.jsp?connectionType=${connectionType}&alias=${alias}&delete=true&csrf=${csrf}"
                                            title="<fmt:message key="global.click_delete"/>"
                                            onclick="return confirm('<fmt:message key="ssl.certificates.confirm_delete"/>');"
                                                 ><img src="images/delete-16x16.gif" width="16" height="16" border="0" alt=""></a>