diff --git a/src/zm_event.h b/src/zm_event.h
index 579a4e29f..a9a30f640 100644
--- a/src/zm_event.h
+++ b/src/zm_event.h
@@ -89,7 +89,7 @@ protected:
 		bulk_frame_interval = (int)config.Item( ZM_BULK_FRAME_INTERVAL );
 		snprintf( capture_file_format, sizeof(capture_file_format), "%%s/%%0%dd-capture.jpg", (int)config.Item( ZM_EVENT_IMAGE_DIGITS ) );
 		snprintf( analyse_file_format, sizeof(analyse_file_format), "%%s/%%0%dd-analyse.jpg", (int)config.Item( ZM_EVENT_IMAGE_DIGITS ) );
-		snprintf( general_file_format, sizeof(general_file_format), "%%s/%%0%dd-%%s.jpg", (int)config.Item( ZM_EVENT_IMAGE_DIGITS ) );
+		snprintf( general_file_format, sizeof(general_file_format), "%%s/%%0%dd-%%s", (int)config.Item( ZM_EVENT_IMAGE_DIGITS ) );
 	}
 
 public:
diff --git a/web/zm_html_view_frame.php b/web/zm_html_view_frame.php
index ce681d34c..4d55e1f4d 100644
--- a/web/zm_html_view_frame.php
+++ b/web/zm_html_view_frame.php
@@ -53,6 +53,8 @@ $last_fid = $max_fid;
 
 $event_path = ZM_DIR_EVENTS.'/'.$event['MonitorId'].'/'.$event['Id'];
 $image_path = sprintf( "%s/%0".ZM_EVENT_IMAGE_DIGITS."d-capture.jpg", $event_path, $fid );
+$d_image_path = sprintf( "%s/%0".ZM_EVENT_IMAGE_DIGITS."d-diag-d.jpg", $event_path, $fid );
+$r_image_path = sprintf( "%s/%0".ZM_EVENT_IMAGE_DIGITS."d-diag-r.jpg", $event_path, $fid );
 $anal_image = preg_replace( "/capture/", "analyse", $image_path );
 if ( file_exists( $anal_image ) )
 {
@@ -114,6 +116,14 @@ function deleteEvent()
 <td align="center" width="25%" class="text">&nbsp;</td>
 <?php } ?>
 </tr>
+<?php if (file_exists ($d_image_path)) { ?>
+<tr><td colspan="4"><?= $d_image_path ?></tr>
+<tr><td colspan="4"><img src="<?= $d_image_path ?>" width="<?= $event['Width'] ?>" height="<?= $event['Height'] ?>" class="<?= $img_class ?>"></td></tr>
+<?php } ?>
+<?php if (file_exists ($r_image_path)) { ?>
+<tr><td colspan="4"><?= $r_image_path ?></tr>
+<tr><td colspan="4"><img src="<?= $r_image_path ?>" width="<?= $event['Width'] ?>" height="<?= $event['Height'] ?>" class="<?= $img_class ?>"></td></tr>
+<?php } ?>
 </table>
 </body>
 </html>