diff --git a/security/psm/server/advisor.c b/security/psm/server/advisor.c
index 2f606f5850e3..cbe6e6b88e84 100644
--- a/security/psm/server/advisor.c
+++ b/security/psm/server/advisor.c
@@ -265,7 +265,14 @@ SSMSecurityAdvisorContext_Destroy(SSMResource *res, PRBool doFree)
         if (ct->socketStatus) {
             SSM_FreeResource(&ct->socketStatus->super);
         }
-
+        PR_FREEIF(ct->hostname);
+        PR_FREEIF(ct->senderAddr);
+        if (ct->recipients) {
+            for (i=0; i<ct->numRecipients; i++) {
+                PR_FREEIF(ct->recipients[i]);
+            }
+            PR_FREEIF(ct->recipients);
+        }
         /* Free if asked */
         if (doFree)
             PR_Free(ct);
@@ -3296,11 +3303,14 @@ SSM_ListCRLs(SSMTextGenContext *cx)
 }
 
 SSMStatus
-ssm_getStringForAbleAgent(SSMTextGenContext *cx, const char *agents[],
-                          const char *key)
+ssm_getStringForAbleAgent(SSMTextGenContext *cx, const char *agents[])
 {
     int i;
     SSMStatus rv;
+    char *key;
+    
+    key = SSM_At(cx->m_params, 0);
+
 
     for (i=0; agents[i] != NULL; i++) {
         if (PL_strstr(cx->m_request->agent, agents[i]) != NULL) {
@@ -3317,15 +3327,15 @@ ssm_getStringForAbleAgent(SSMTextGenContext *cx, const char *agents[],
 
 SSMStatus SSM_LayoutSMIMETab(SSMTextGenContext *cx)
 {
-    return ssm_getStringForAbleAgent(cx, kSMimeApps, "app_does_smime");
+    return ssm_getStringForAbleAgent(cx, kSMimeApps);
 }
 
 SSMStatus SSM_LayoutJavaJSTab(SSMTextGenContext *cx)
 {
-    return ssm_getStringForAbleAgent(cx, kJavaJSApps, "app_does_javajs");
+    return ssm_getStringForAbleAgent(cx, kJavaJSApps);
 }
 
 SSMStatus SSM_LayoutOthersTab(SSMTextGenContext *cx)
 {
-    return ssm_getStringForAbleAgent(cx, kSMimeApps, "app_uses_others");
+    return ssm_getStringForAbleAgent(cx, kSMimeApps);
 }
diff --git a/security/psm/ui/psm_ui.properties.in b/security/psm/ui/psm_ui.properties.in
index af9567d007ff..fda4ea1103b4 100644
--- a/security/psm/ui/psm_ui.properties.in
+++ b/security/psm/ui/psm_ui.properties.in
@@ -895,23 +895,26 @@ left1-2_content={leftframework left1-2tabs,info_about}
 app_does_smime={link_left_tab {text_messenger},2,2}
 app_does_javajs={link_left_tab {text_javajs},2,3}
 
+app_does_smime_selected={select_left_tab {text_messenger},2,2}
+app_does_javajs_selected={select_left_tab {text_javajs},2,3}
+
 ;
 ; Applications pane
 ;
 left2-1tabs:
 {select_left_tab {text_navigator}}
-{_smime_tab}
-{_java_js_tab}
+{_smime_tab app_does_smime}
+{_java_js_tab app_does_javajs}
 :left2-1tabs
 left2-2tabs:
 {link_left_tab {text_navigator},2,1}
-{_smime_tab}
-{_java_js_tab}
+{_smime_tab app_does_smime_selected}
+{_java_js_tab app_does_javajs}
 :left2-2tabs
 left2-3tabs:
 {link_left_tab {text_navigator},2,1}
-{_smime_tab}
-{_java_js_tab}
+{_smime_tab app_does_smime}
+{_java_js_tab app_does_javajs_selected}
 :left2-3tabs
 
 ; Top level pages
@@ -923,31 +926,32 @@ left2-3_type=text/html
 left2-3_content={leftframework left2-3tabs,apps_javajs}
 
 app_uses_others={link_left_tab {text_others},3,2}
+app_uses_others_selected={select_left_tab {text_others},3,2}
 
 ;
 ; Certificates pane
 ;
 left3-1tabs:
 {select_left_tab {text_mine},3,1}
-{_addOthersCerts}
+{_addOthersCerts app_uses_others}
 {link_left_tab {text_websites},3,3}
 {link_left_tab {text_authorities},3,4}
 :left3-1tabs
 left3-2tabs:
 {link_left_tab {text_mine},3,1}
-{_addOthersCerts}
+{_addOthersCerts app_uses_others_selected}
 {link_left_tab {text_websites},3,3}
 {link_left_tab {text_authorities},3,4}
 :left3-2tabs
 left3-3tabs:
 {link_left_tab {text_mine},3,1}
-{_addOthersCerts}
+{_addOthersCerts app_uses_others}
 {select_left_tab {text_websites},3,3}
 {link_left_tab {text_authorities},3,4}
 :left3-3tabs
 left3-4tabs:
 {link_left_tab {text_mine},3,1}
-{_addOthersCerts}
+{_addOthersCerts app_uses_others}
 {link_left_tab {text_websites},3,3}
 {select_left_tab {text_authorities},3,4}
 :left3-4tabs