diff --git a/admin/include/plugins.class.php b/admin/include/plugins.class.php
index 23e9b326e..313f3624f 100644
--- a/admin/include/plugins.class.php
+++ b/admin/include/plugins.class.php
@@ -447,7 +447,7 @@ DELETE FROM '. PLUGINS_TABLE .'
     $versions_to_check = $this->get_versions_to_check($beta_test);
     if (empty($versions_to_check))
     {
-      return false;
+      return true;
     }
 
     // Plugins to check
diff --git a/admin/plugins_new.php b/admin/plugins_new.php
index a02c2415e..a3e3447bf 100644
--- a/admin/plugins_new.php
+++ b/admin/plugins_new.php
@@ -181,5 +181,10 @@ else
   $page['errors'][] = l10n('Can\'t connect to server.');
 }
 
+if (!$beta_test and preg_match('/(beta|RC)/', PHPWG_VERSION))
+{
+  $template->assign('BETA_URL', $base_url.'&beta-test=true');
+}
+
 $template->assign_var_from_handle('ADMIN_CONTENT', 'plugins');
 ?>
\ No newline at end of file
diff --git a/admin/themes/default/template/plugins_new.tpl b/admin/themes/default/template/plugins_new.tpl
index cf6d3cf3a..d61499cb9 100644
--- a/admin/themes/default/template/plugins_new.tpl
+++ b/admin/themes/default/template/plugins_new.tpl
@@ -32,7 +32,7 @@ const str_from_begining = "{"since the beginning"|@translate}";
 <div class="titrePage">
   <div class="sort">
     <div class="sort-actions">
-      <div class="beta-test-plugin-switch">
+      <div class="beta-test-plugin-switch tiptip" title="{'Show plugins compatible with previous version of Piwigo'|translate|escape:html}">
         <label class="switch">
           <input type="checkbox" id="showBetaTestPlugin" {if $BETA_TEST}checked{/if}>
           <span class="slider round"></span>
@@ -208,5 +208,9 @@ const str_from_begining = "{"since the beginning"|@translate}";
 {/foreach}
 </div>
 {else}
-<p>{'There is no other plugin available.'|@translate}</p>
+<p>{'There is no other plugin available.'|@translate}
+{if isset($BETA_URL)}
+  <a href="{$BETA_URL}" class="buttonLike icon-fire">{'Show beta test plugins'|@translate}</a>
+{/if}
+</p>
 {/if}
\ No newline at end of file