diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index e40caa3e36e..9bd700a7c9e 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -148,11 +148,11 @@ print '> '.$langs->trans("PurgeDeleteAllFilesInDocumentsDir",$dolibarr_main_data
 
 print '</td></tr></table>';
 
-if ($choice != 'confirm_allfiles')
-{
+//if ($choice != 'confirm_allfiles')
+//{
 	print '<br>';
 	print '<div class="center"><input class="button" type="submit" value="'.$langs->trans("PurgeRunNow").'"></div>';
-}
+//}
 
 print '</form>';
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1200d674ccd..0adf708b392 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3225,7 +3225,7 @@ class Form
             		{
 						$formconfirm.='
 						open: function() {
-            				$(this).parent().find("button.ui-button:eq(1)").focus();
+            				$(this).parent().find("button.ui-button:eq(2)").focus();
 						},';
             		}
         			$formconfirm.='