diff --git a/ui/src/config/section/infra/routers.js b/ui/src/config/section/infra/routers.js
index 92db3c80995..a031005db8a 100644
--- a/ui/src/config/section/infra/routers.js
+++ b/ui/src/config/section/infra/routers.js
@@ -102,7 +102,8 @@ export default {
         targetid: {
           value: (record) => { return record.id }
         }
-      }
+      },
+      response: (result) => { return result && result.diagnostics && result.diagnostics.url ? `Please click the link to download the retrieved diagnostics: <p><a href='${result.diagnostics.url}'>${result.diagnostics.url}</a></p>` : 'Invalid response' }
     },
     {
       api: 'destroyRouter',
diff --git a/ui/src/config/section/infra/systemVms.js b/ui/src/config/section/infra/systemVms.js
index 67597b45319..380bb3060ff 100644
--- a/ui/src/config/section/infra/systemVms.js
+++ b/ui/src/config/section/infra/systemVms.js
@@ -93,7 +93,8 @@ export default {
         targetid: {
           value: (record) => { return record.id }
         }
-      }
+      },
+      response: (result) => { return result && result.diagnostics && result.diagnostics.url ? `Please click the link to download the retrieved diagnostics: <p><a href='${result.diagnostics.url}'>${result.diagnostics.url}</a></p>` : 'Invalid response' }
     },
     {
       api: 'destroySystemVm',
diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index 1bbfad6383f..8f7468096d1 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -646,7 +646,7 @@ export default {
             const description = action.response(result.jobresult)
             if (description) {
               this.$notification.info({
-                message: action.label,
+                message: this.$t(action.label),
                 description: (<span domPropsInnerHTML={description}></span>),
                 duration: 0
               })