diff --git a/admin.php b/admin.php
index 36d1c3b44..79fb724e9 100644
--- a/admin.php
+++ b/admin.php
@@ -238,15 +238,14 @@ if ($nb_photos_in_caddie > 0)
 }
 
 // any photos with no md5sum ?
-$nb_no_md5sum =  count(get_photos_no_md5sum());
-if ($nb_no_md5sum > 0)
+if (in_array($page['page'], array('site_update', 'batch_manager')))
 {
-  $template->assign(
-    array(
-      'NB_NO_MD5SUM' => $nb_no_md5sum,
-      'U_NO_MD5SUM' => $link_start.'batch_manager&filter=prefilter-no_sync_md5sum',
-    )
-  );
+  $nb_no_md5sum = count(get_photos_no_md5sum());
+
+  if ($nb_no_md5sum > 0)
+  {
+    $page['no_md5sum_number'] = $nb_no_md5sum;
+  }
 }
 
 // any orphan photo?
diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php
index de677f957..7c3078a82 100644
--- a/admin/batch_manager_global.php
+++ b/admin/batch_manager_global.php
@@ -470,6 +470,15 @@ $template->assign(
    )
  );
 
+if (isset($page['no_md5sum_number']))
+{
+  $template->assign(
+    array(
+      'NB_NO_MD5SUM' => $page['no_md5sum_number'],
+    )
+  );
+}
+
 // +-----------------------------------------------------------------------+
 // |                            caddie options                             |
 // +-----------------------------------------------------------------------+
diff --git a/admin/intro.php b/admin/intro.php
index 09ec496b5..0be9e70a2 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -44,28 +44,6 @@ $tabsheet->assign();
 // |                                actions                                |
 // +-----------------------------------------------------------------------+
 
-//check if images have no md5sum in database
-$query = '
-SELECT COUNT(*)
-  FROM '.CATEGORIES_TABLE.'
-  WHERE dir IS NOT NULL
-;';
-list($counter) = pwg_db_fetch_row(pwg_query($query));
-if ($counter > 0)
-{
-  $query = '
-  SELECT COUNT(*)
-    FROM '.IMAGES_TABLE.'
-    WHERE storage_category_id IS NOT NULL
-      AND md5sum IS NULL
-  ;';
-  list($counter) = pwg_db_fetch_row(pwg_query($query));
-  if ($counter > 0)
-  {
-    $page['warnings'][] = '<a href="admin.php?page=batch_manager&amp;filter=prefilter-no_sync_md5sum">'.l10n('Some checksums are missing.').'<i class="icon-right"></i></a>';
-  }
-}
-
 if (isset($page['nb_pending_comments']))
 {
   $message = l10n('User comments').' <i class="icon-chat"></i> ';
diff --git a/admin/site_update.php b/admin/site_update.php
index b51b4c962..791a8d59e 100644
--- a/admin/site_update.php
+++ b/admin/site_update.php
@@ -67,6 +67,11 @@ else
   $site_reader = new LocalSiteReader($site_url);
 }
 
+if (isset($page['no_md5sum_number']))
+{
+  $page['messages'][] = '<a href="admin.php?page=batch_manager&amp;filter=prefilter-no_sync_md5sum">'.l10n('Some checksums are missing.').'<i class="icon-right"></i></a>';
+}
+
 // +-----------------------------------------------------------------------+
 // | Quick sync                                                            |
 // +-----------------------------------------------------------------------+