diff --git a/www/src/app/pages/jobs/job.controller.js b/www/src/app/pages/jobs/job.controller.js
index 0cb5980a8..2b50356d2 100644
--- a/www/src/app/pages/jobs/job.controller.js
+++ b/www/src/app/pages/jobs/job.controller.js
@@ -6,4 +6,9 @@ export default class JobController {
 
     this.$log = $log;
   }
-}
+
+  $onInit() {
+    this.protectDownloadsWith = this.main.config.config.protectDownloadsWith;
+    this.hasFileArtifact = this.job.report.artifacts.find(item => item.dataType === 'file');
+  }
+}
\ No newline at end of file
diff --git a/www/src/app/pages/jobs/job.page.html b/www/src/app/pages/jobs/job.page.html
index 3551e1247..b8ceea0b8 100644
--- a/www/src/app/pages/jobs/job.page.html
+++ b/www/src/app/pages/jobs/job.page.html
@@ -30,6 +30,9 @@ <h5 class="text-primary mt-xs">Report</h5>
 
           <div ng-if="$ctrl.job.report.artifacts.length > 0">
             <h5 class="text-primary mt-xs">Artifacts</h5>
+            <div class="mv-xxs" ng-if="$ctrl.hasFileArtifact">
+              <small class="text-danger">Zip are protected with password "{{$ctrl.protectDownloadsWith}}"</small>
+            </div>
             <table class="table table-striped">
               <tr>
                 <th width="20">#</th>
@@ -40,8 +43,15 @@ <h5 class="text-primary mt-xs">Artifacts</h5>
                 <td>{{$index + 1}}</td>
                 <td>{{artifact.dataType}}</td>
                 <td>
-                  <div class="wrap">
-                    {{(artifact.attachment.name || artifact.data) | fang}}
+                  <div class="wrap" ng-if="artifact.dataType === 'file'">
+                    {{artifact.attachment.name| fang}}
+                    <a href="./api/datastorezip/{{artifact.attachment.id}}?name={{artifact.attachment.name}}"
+                      target="_blank">
+                      (Download)
+                    </a>
+                  </div>
+                  <div class="wrap" ng-if="artifact.dataType !== 'file'">
+                    {{artifact.data | fang}}
                   </div>
                   <div ng-if="artifact.tags.length > 0">
                     <span class="label label-primary"
diff --git a/www/src/app/pages/jobs/jobs.module.js b/www/src/app/pages/jobs/jobs.module.js
index 3df519c6c..1eb6a310e 100644
--- a/www/src/app/pages/jobs/jobs.module.js
+++ b/www/src/app/pages/jobs/jobs.module.js
@@ -29,11 +29,9 @@ const jobsModule = angular
         url: 'jobs',
         component: 'jobsPage',
         resolve: {
-          datatypes: ($q, AnalyzerService) => {
-            return AnalyzerService.list()
-              .then(() => $q.resolve(AnalyzerService.getTypes()))
-              .catch(err => $q.reject(err));
-          },
+          datatypes: ($q, AnalyzerService) => AnalyzerService.list()
+            .then(() => $q.resolve(AnalyzerService.getTypes()))
+            .catch(err => $q.reject(err)),
           jobtypes: () => ['analyzer', 'responder'],
           analyzers: AnalyzerService =>
             AnalyzerService.list().then(analyzers =>
@@ -97,6 +95,9 @@ const jobsModule = angular
     templateUrl: jobTpl,
     bindings: {
       job: '<'
+    },
+    require: {
+      main: '^^mainPage'
     }
   })
   .component('jobDetails', {