2 files changed, 18 insertions, 1 deletions
diff --git a/base/tps/shared/webapps/tps/js/cert.js b/base/tps/shared/webapps/tps/js/cert.js
index 016b56ee0..c8e8d5d02 100644
--- a/base/tps/shared/webapps/tps/js/cert.js
+++ b/base/tps/shared/webapps/tps/js/cert.js
@@ -90,9 +90,18 @@ var CertificatesPage = Page.extend({
     load: function() {
         var self = this;
 
+        if (self.collection && self.collection.options && self.collection.options.tokenID) {
+            $(".pki-breadcrumb-tokens").show();
+            $(".pki-breadcrumb-token a")
+                .attr("href", "#tokens/" + self.collection.options.tokenID)
+                .text("Token " + self.collection.options.tokenID);
+            $(".pki-breadcrumb-token").show();
+            $(".pki-title").text("Certificates for Token " + self.collection.options.tokenID);
+        }
+
         var table = new CertificatesTable({
             el: $("table[name='certificates']"),
-            collection: new CertificateCollection()
+            collection: self.collection
         });
 
         table.render();
diff --git a/base/tps/shared/webapps/tps/js/token.js b/base/tps/shared/webapps/tps/js/token.js
index 2ea17714e..c1f27b132 100644
--- a/base/tps/shared/webapps/tps/js/token.js
+++ b/base/tps/shared/webapps/tps/js/token.js
@@ -153,6 +153,14 @@ var TokenPage = EntryPage.extend({
 
             dialog.open();
         });
+
+        self.showCertsLink = $("a[name='showCerts']", self.menu);
+
+        self.showCertsLink.click(function(e) {
+
+            e.preventDefault();
+            window.location.hash = window.location.hash + "/certs";
+        });
     },
     renderContent: function() {
         var self = this;