diff --git a/frontend/src/pages/jobs/[id].vue b/frontend/src/pages/jobs/[id].vue
index e3126ff..ad5ed18 100644
--- a/frontend/src/pages/jobs/[id].vue
+++ b/frontend/src/pages/jobs/[id].vue
@@ -26,8 +26,10 @@
         <br/>
         Package(s) not built due to previous build failure: {{ job.skipped_packages }}
         <br/>
-        Log: {{ job.log_url }}
-        <br/>
+        <div v-if="job.log_url !== null && job.log_url !== undefined">
+          Log: <a :href="job.log_url">Raw</a> or <a :href="job.log_url.replace('/logs/', '/web-logs/')">Web Viewer</a>
+          <br/>
+        </div>
         Status: {{ job.status }}
       </v-card-text>
     </v-card>
diff --git a/frontend/src/pages/workers/[id].vue b/frontend/src/pages/workers/[id].vue
index 41c8f1a..8cdbea3 100644
--- a/frontend/src/pages/workers/[id].vue
+++ b/frontend/src/pages/workers/[id].vue
@@ -16,11 +16,13 @@
         <br/>
         Last heartbeat time: {{ worker.last_heartbeat_time }}
         <br/>
-        Running job id: 
-        <router-link v-if="worker.running_job_id !== undefined" :to="{ path: `/workers/${worker.running_job_id}` }">
-          {{ worker.running_job_id }}
-        </router-link>
-        <br/>
+        <div v-if="worker.running_job_id !== undefined && worker.running_job_id !== null">
+          Running job id: 
+          <router-link :to="{ path: `/workers/${worker.running_job_id}` }">
+            {{ worker.running_job_id }}
+          </router-link>
+          <br/>
+        </div>
         Built job count: {{ worker.built_job_count }}
       </v-card-text>
     </v-card>