diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Trust/Api/CaController.php b/src/opnsense/mvc/app/controllers/OPNsense/Trust/Api/CaController.php
index d0947365b..edc460d32 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Trust/Api/CaController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Trust/Api/CaController.php
@@ -233,6 +233,7 @@ class CaController extends ApiMutableModelControllerBase
         $result = ['status' => 'failed'];
         if ($this->request->isPost() && !empty($uuid)) {
             $node = $this->getModel()->getNodeByReference('ca.' . $uuid);
+            $result['descr'] = $node !== null ? (string)$node->descr : '';
             if ($node === null || empty((string)$node->crt_payload)) {
                 $result['error'] = gettext('Misssing certificate');
             } elseif ($type == 'crt') {
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Trust/Api/CertController.php b/src/opnsense/mvc/app/controllers/OPNsense/Trust/Api/CertController.php
index 93e20eb9b..c4b999eac 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Trust/Api/CertController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Trust/Api/CertController.php
@@ -275,6 +275,7 @@ class CertController extends ApiMutableModelControllerBase
         $result = ['status' => 'failed'];
         if ($this->request->isPost() && !empty($uuid)) {
             $node = $this->getModel()->getNodeByReference('cert.' . $uuid);
+            $result['descr'] = $node !== null ? (string)$node->descr : '';
             if ($node === null || empty((string)$node->crt_payload)) {
                 $result['error'] = gettext('Misssing certificate');
             } elseif ($type == 'crt') {
diff --git a/src/opnsense/mvc/app/views/OPNsense/Trust/ca.volt b/src/opnsense/mvc/app/views/OPNsense/Trust/ca.volt
index 8e65e2180..01225bf89 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Trust/ca.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Trust/ca.volt
@@ -82,7 +82,7 @@
                                         '/api/trust/ca/generate_file/'+uuid+'/'+$type.val(),
                                         params,
                                         function(data, status) {
-                                            download_content(data.payload, $type.val() + '.pem', 'application/octet-stream');
+                                            download_content(data.payload, data.descr + '_' + $type.val() + '.pem', 'application/octet-stream');
                                         }
                                     )
                                     dialogItself.close();
diff --git a/src/opnsense/mvc/app/views/OPNsense/Trust/cert.volt b/src/opnsense/mvc/app/views/OPNsense/Trust/cert.volt
index 8ec30ce56..994b5e016 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Trust/cert.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Trust/cert.volt
@@ -104,15 +104,15 @@
                                         params,
                                         function(data, status) {
                                             let payload = null;
-                                            let filename = null;
+                                            let filename = data.descr + '_' ;
                                             let mediatype = 'application/octet-stream';
                                             if (data.payload_b64) {
                                                 mediatype += ';base64';
                                                 payload = data.payload_b64;
-                                                filename = 'cert.p12';
+                                                filename += 'cert.p12';
                                             } else if (data.payload) {
                                                 payload = data.payload;
-                                                filename = $type.val() + '.pem';
+                                                filename += $type.val() + '.pem';
                                             }
                                             if (payload !== null) {
                                                 download_content(payload, filename, mediatype);