diff --git a/lemur/static/app/angular/authorities/authority/authority.js b/lemur/static/app/angular/authorities/authority/authority.js
index 3b6ec544..bf0bfc61 100644
--- a/lemur/static/app/angular/authorities/authority/authority.js
+++ b/lemur/static/app/angular/authorities/authority/authority.js
@@ -53,6 +53,23 @@ angular.module('lemur')
             $scope.authority.authority = authority;
           }
         });
+      },
+      render: {
+        option: function(item) {
+            return '<div><dl>' +
+                '<dt>' +
+                    '<span>' + item.name + ' <small>' + item.owner + '</small></span>' +
+                '</dt>' +
+                '<dd>' +
+                  '<span>' + item.description + '</span>' +
+                '</dd>' +
+            '</dl></div>';
+        }
+      },
+      load: function (value) {
+        AuthorityService.findAuthorityByName(value).then(function (authorities) {
+          $scope.authorities = authorities;
+        });
       }
     };
 
diff --git a/lemur/static/app/angular/certificates/certificate/certificate.js b/lemur/static/app/angular/certificates/certificate/certificate.js
index a230b5db..d3d3c8a2 100644
--- a/lemur/static/app/angular/certificates/certificate/certificate.js
+++ b/lemur/static/app/angular/certificates/certificate/certificate.js
@@ -111,6 +111,23 @@ angular.module('lemur')
             $scope.certificate.authority = authority;
           }
         });
+      },
+      render: {
+        option: function(item) {
+            return '<div><dl>' +
+                '<dt>' +
+                    '<span>' + item.name + ' <small>' + item.owner + '</small></span>' +
+                '</dt>' +
+                '<dd>' +
+                  '<span>' + item.description + '</span>' +
+                '</dd>' +
+            '</dl></div>';
+        }
+      },
+      load: function (value) {
+        AuthorityService.findAuthorityByName(value).then(function (authorities) {
+          $scope.authorities = authorities;
+        });
       }
     };