diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 7760e28be68..8a2b77c82a6 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -238,7 +238,15 @@ print '<td align="center">'.$langs->trans("Action").'</td>';
 print '</tr>';
 
 print "<tr ".$bc[$var].">";
-print '<td colspan="3">'.$langs->trans("DoNotStoreClearPassword").'</td>';
+if($conf->global->DATABASE_PWD_ENCRYPTED == 1)
+{
+	print '<td colspan="3">';
+}
+else
+{
+	print '<td colspan="2">';
+}
+print $langs->trans("DoNotStoreClearPassword").'</td>';
 print '<td align="center" width="20">';
 if($conf->global->DATABASE_PWD_ENCRYPTED == 1)
 {