diff --git a/admin/intro.php b/admin/intro.php
index c8b40898a..35ca69e67 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -135,7 +135,7 @@ $query = '
 SELECT COUNT(*)
   FROM '.IMAGES_TABLE.'
 ;';
-list($nb_elements) = pwg_db_fetch_row(pwg_query($query));
+list($nb_photos) = pwg_db_fetch_row(pwg_query($query));
 
 $query = '
 SELECT COUNT(*)
@@ -199,7 +199,7 @@ $disk_usage+= $formats_disk_usage;
 
 $template->assign(
   array(
-    'NB_PHOTOS' => number_format($nb_elements, 0, '.', ','),
+    'NB_PHOTOS' => number_format($nb_photos, 0, '.', ','),
     'NB_ALBUMS' => $nb_categories,
     'NB_TAGS' => $nb_tags,
     'NB_IMAGE_TAG' => $nb_image_tag,
@@ -224,7 +224,7 @@ SELECT COUNT(*)
   $template->assign('NB_COMMENTS', $nb_comments);
 }
 
-if ($nb_elements > 0)
+if ($nb_photos > 0)
 {
   $query = '
 SELECT MIN(date_available)
diff --git a/admin/themes/default/template/intro.tpl b/admin/themes/default/template/intro.tpl
index 461fd60d8..5bdb30cff 100644
--- a/admin/themes/default/template/intro.tpl
+++ b/admin/themes/default/template/intro.tpl
@@ -83,60 +83,80 @@ jQuery().ready(function(){
 
 <div class="stat-boxes">
 
+{if $NB_PHOTOS > 1}
 <div class="stat-box">
 <i class="icon-picture"></i>
 <span class="number">{$NB_PHOTOS}</span><span class="caption">{'Photos'|translate}</span>
 </div>
+{/if}
 
+{if $NB_ALBUMS > 1}
 <div class="stat-box">
 <i class="icon-sitemap"></i>
 <span class="number">{$NB_ALBUMS}</span><span class="caption">{'Albums'|translate}</span>
 </div>
+{/if}
 
+{if $NB_TAGS > 1}
 <div class="stat-box">
 <i class="icon-tags"></i>
 <span class="number">{$NB_TAGS}</span><span class="caption" title="{'%d associations'|translate:$NB_IMAGE_TAG}">{'Tags'|translate}</span>
 </div>
+{/if}
 
+{if $NB_USERS > 2}
 <div class="stat-box">
 <i class="icon-users"></i>
 <span class="number">{$NB_USERS}</span><span class="caption">{'Users'|translate}</span>
 </div>
+{/if}
 
+{if $NB_GROUPS > 0}
 <div class="stat-box">
 <i class="icon-group"></i>
 <span class="number">{$NB_GROUPS}</span><span class="caption">{'Groups'|translate}</span>
 </div>
+{/if}
 
+{if $NB_COMMENTS > 1}
 <div class="stat-box">
 <i class="icon-chat"></i>
 <span class="number">{$NB_COMMENTS}</span><span class="caption">{'Comments'|translate}</span>
 </div>
+{/if}
 
+{if $NB_RATES > 0}
 <div class="stat-box">
 <i class="icon-star"></i>
 <span class="number">{$NB_RATES}</span><span class="caption">{'Rating'|translate}</span>
 </div>
+{/if}
 
+{if $NB_VIEWS > 0}
 <div class="stat-box">
 <i class="icon-signal"></i>
 <span class="number">{$NB_VIEWS}</span><span class="caption">{'Pages seen'|translate}</span>
 </div>
+{/if}
 
+{if $NB_PLUGINS > 0}
 <div class="stat-box">
 <i class="icon-puzzle"></i>
 <span class="number">{$NB_PLUGINS}</span><span class="caption">{'Plugins'|translate}</span>
 </div>
+{/if}
 
 <div class="stat-box">
 <i class="icon-hdd"></i>
 <span class="number">{$STORAGE_USED}</span><span class="caption">{'Storage used'|translate}</span>
 </div>
 
+{if $NB_PHOTOS > 1}
 <div class="stat-box">
 <i class="icon-back-in-time"></i>
 <span class="number">{$first_added_age}</span><span class="caption" title="{'first photo added on %s'|translate:$first_added_date}">{'First photo added'|translate}</span>
 </div>
+{/if}
 
 </div> {* .stat-boxes *}