diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index 69ab2406519..a68da4e43d3 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -117,8 +117,8 @@ if (! empty($_GET["radio_dump"])) print "document.getElementById('mysql_options'
 	print '<br>';
 	print '<textarea rows="1" cols="120">'.$langs->trans("ImportMySqlCommand",$command,$_GET["showpass"]?$paramclear:$paramcrypted).'</textarea><br>';
 
-	if ($_GET["showpass"]) print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
-	else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=mysql_options">'.$langs->trans("UnHidePassword").'</a>';
+	if (empty($_GET["showpass"])) print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=mysql_options">'.$langs->trans("UnHidePassword").'</a>';
+	//else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
 	print '</div>';
 	
 	?>
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 10a567f8199..df998004ac5 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2006-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -89,10 +89,13 @@ if ($what == 'mysql')
 	create_exdir(DOL_DATA_ROOT.'/admin/temp');
 	
 	// Parameteres execution	
-	$command=escapeshellarg($mysqldump);
+	$command=$mysqldump;
+	if (eregi(" ",$command)) $command=$command=escapeshellarg($command);	// Use quotes on command
+	
 	//$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
 	$param=$dolibarr_main_db_name." -h ".$dolibarr_main_db_host;
 	$param.=" -u ".$dolibarr_main_db_user;
+	if (! empty($dolibarr_main_db_port)) $param.=" -P ".$dolibarr_main_db_port;
 	$compression=isset($_POST['compression']) ? $_POST['compression'] : 'none';
 	if (! $_POST["use_transaction"]) $param.=" -l --single-transaction";
 	if ($_POST["disable_fk"])        $param.=" -K";
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index d8877a2c57c..5237c8e89d1 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -96,7 +96,7 @@ if ($result)
 	$num = $db->num_rows($result);
 	$i = 0;
 
-	print_barre_liste($langs->trans("ListOfSecurityEvents"), $page, "listevents.php","",$sortfield,$sortorder,'',$num);
+	print_barre_liste($langs->trans("ListOfSecurityEvents"), $page, "listevents.php","",$sortfield,$sortorder,'',$num,0,'setup');
 
 	if ($_GET["action"] == 'purge')
 	{
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 564f1dcb591..1a5953166d0 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -461,6 +461,8 @@ DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
 Signature=Signature
+HidePassword=Show command with password hidden
+UnHidePassword=Show real command with clear password
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 7eb6b1d928f..72180294a53 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -462,6 +462,8 @@ DisabledModules=Modules d
 For=Pour
 ForCustomer=Pour le client
 Signature=Sign
+HidePassword=Afficher commande avec mot de passe masqué
+UnHidePassword=Afficher commande réelle avec mot de passe en clair
 # Week day
 Monday=Lundi
 Tuesday=Mardi
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 4ec9e5274f6..a09a7c076c0 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -193,8 +193,8 @@ if (! defined('NOREQUIREDB'))
 	}
 }
 // Now database connexion is known we can forget password
-$dolibarr_main_db_pass='';
-$conf->db->pass='';
+//$dolibarr_main_db_pass=''; 	// Comment this because pass is used in a lot of pages
+$conf->db->pass='';				// This is to avoir password to be shown in dump
 
 /*
  * Creation objet $user