diff --git a/admin/maintenance_actions.php b/admin/maintenance_actions.php
index 375eb73a8..09a63cb63 100644
--- a/admin/maintenance_actions.php
+++ b/admin/maintenance_actions.php
@@ -254,7 +254,8 @@ $template->set_filenames(array('maintenance'=>'maintenance_actions.tpl'));
 $pwg_token = get_pwg_token();
 $url_format = get_root_url().'admin.php?page=maintenance&action=%s&pwg_token='.get_pwg_token();
 
-if (!is_webmaster()) {
+if (!is_webmaster()) 
+{
   $page['warnings'][] = l10n('Webmaster status is required.');
 }
 
diff --git a/admin/site_update.php b/admin/site_update.php
index 74b4353bd..6bc819cbd 100644
--- a/admin/site_update.php
+++ b/admin/site_update.php
@@ -72,7 +72,8 @@ 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>';
 }
 
-if (!is_webmaster()) {
+if (!is_webmaster()) 
+{
   $page['warnings'][] = l10n('Webmaster status is required.');
 }
 
diff --git a/admin/themes/default/template/updates_ext.tpl b/admin/themes/default/template/updates_ext.tpl
index a4b1cb52a..a3bb32ca6 100644
--- a/admin/themes/default/template/updates_ext.tpl
+++ b/admin/themes/default/template/updates_ext.tpl
@@ -170,6 +170,8 @@ $("#update_all").click(function() {
   <h2>{'Updates'|@translate}</h2>
 </div>
 
+{if $isWebmaster == 1}
+
 <div class="autoupdate_bar">
 <input type="submit" id="update_all" value="{'Update All'|@translate}">
 <input type="submit" id="ignore_all" value="{'Ignore All'|@translate}" onClick="ignoreAll(); return false;">
@@ -306,3 +308,5 @@ $("#update_all").click(function() {
 </fieldset>
 </div>
 {/if}
+
+{/if}
diff --git a/admin/updates_ext.php b/admin/updates_ext.php
index 77354b282..7826446d0 100644
--- a/admin/updates_ext.php
+++ b/admin/updates_ext.php
@@ -1,16 +1,21 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | This file is part of Piwigo.                                          |
-// |                                                                       |
-// | For copyright and license information, please view the COPYING.txt    |
-// | file that was distributed with this source code.                      |
-// +-----------------------------------------------------------------------+
+<?php
+// +-----------------------------------------------------------------------+
+// | This file is part of Piwigo.                                          |
+// |                                                                       |
+// | For copyright and license information, please view the COPYING.txt    |
+// | file that was distributed with this source code.                      |
+// +-----------------------------------------------------------------------+
 
 if( !defined("PHPWG_ROOT_PATH") )
 {
   die ("Hacking attempt!");
 }
 
+if (!is_webmaster())
+{
+  $page['warnings'][] = l10n('Webmaster status is required.');
+}
+
 $conf['updates_ignored'] = unserialize($conf['updates_ignored']);
 
 include_once(PHPWG_ROOT_PATH.'admin/include/updates.class.php');
@@ -76,5 +81,6 @@ $template->assign('PWG_TOKEN', get_pwg_token());
 $template->assign('EXT_TYPE', $page['page'] == 'updates' ? 'extensions' : $page['page']);
 $template->set_filename('plugin_admin_content', 'updates_ext.tpl');
 $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
+$template->assign('isWebmaster', (is_webmaster()) ? 1 : 0);
 
 ?>
\ No newline at end of file
diff --git a/admin/updates_pwg.php b/admin/updates_pwg.php
index 247d6020b..dbdaf6d39 100644
--- a/admin/updates_pwg.php
+++ b/admin/updates_pwg.php
@@ -108,7 +108,7 @@ if (isset($new_versions['major_php']) and version_compare(phpversion(), $new_ver
 
 if (!is_webmaster())
 {
-  $page['errors'][] = l10n('Webmaster status is required.');
+  $page['warnings'][] = l10n('Webmaster status is required.');
 }
 
 $template->assign(array(