diff --git a/awstats/bureau/admin/aws_pass.php b/awstats/bureau/admin/aws_pass.php
index 02e202d6..c2eef55e 100644
--- a/awstats/bureau/admin/aws_pass.php
+++ b/awstats/bureau/admin/aws_pass.php
@@ -70,7 +70,7 @@ if (isset($error) && $error) {
 <?php __("Username"); ?></th><td>
 	<code><?php echo $login; ?></code> <input type="hidden" name="login" value="<?php echo $login; ?>" />
 </td></tr>
-<tr><th><label for="pass"><?php __("New Password"); ?></label></th><td><input type="password" class="int" name="pass" id="pass" value="<?php echo $pass; ?>" size="20" maxlength="64" /></td></tr>
+<tr><th><label for="pass"><?php __("New Password"); ?></label></th><td><input type="password" class="int" name="pass" id="pass" value="<?php echo $pass; ?>" size="20" maxlength="64" /><?php display_div_generate_password(); ?></td></tr>
 <tr><th><label for="passconf"><?php __("Confirm password"); ?></label></th><td><input type="password" class="int" name="passconf" id="passconf" value="" size="20" maxlength="64" /></td></tr>
 <tr class="trbtn"><td colspan="2">
   <input type="submit" class="inb" name="submit" value="<?php __("Change this user's password"); ?>" />
diff --git a/awstats/bureau/admin/aws_users.php b/awstats/bureau/admin/aws_users.php
index 2684145e..16d22a73 100644
--- a/awstats/bureau/admin/aws_users.php
+++ b/awstats/bureau/admin/aws_users.php
@@ -47,7 +47,7 @@ if (!$r=$aws->list_login()) {
 <label for="login"><?php __("Username"); ?></label></th><td>
 	<select class="inl" name="prefixe"><?php $aws->select_prefix_list($prefixe); ?></select>&nbsp;<b>_</b>&nbsp;<input type="text" class="int" name="login" id="login" value="" size="20" maxlength="64" />
 </td></tr>
-<tr><th><label for="pass"><?php __("Password"); ?></label></th><td><input type="password" class="int" name="pass" id="pass" value="" size="20" maxlength="64" /></td></tr>
+<tr><th><label for="pass"><?php __("Password"); ?></label></th><td><input type="password" class="int" name="pass" id="pass" value="" size="20" maxlength="64" /><?php display_div_generate_password(); ?></td></tr>
 <tr><th><label for="passconf"><?php __("Confirm password"); ?></label></th><td><input type="password" class="int" name="passconf" id="passconf" value="" size="20" maxlength="64" /></td></tr>
 <tr class="trbtn"><td colspan="2">
   <input type="submit" class="inb" name="submit" value="<?php __("Create this new awstat account"); ?>" />
diff --git a/awstats/bureau/class/m_aws.php b/awstats/bureau/class/m_aws.php
index f6780ec4..8dbdb665 100644
--- a/awstats/bureau/class/m_aws.php
+++ b/awstats/bureau/class/m_aws.php
@@ -463,8 +463,8 @@ class m_aws {
       $err->raise("aws",_("Login incorrect")); // Login incorrect 
       return false;
     }
-    if (!($this->login_exists($login,0))) {
-      $err->raise("aws",_("Login does not exist")); // Login does not exist
+    if ($this->login_exists($login,1)) {
+      $err->raise("aws",_("Login already exist")); // Login already exist
       return false;
     }
     $pass=crypt($pass);
diff --git a/bureau/admin/adm_add.php b/bureau/admin/adm_add.php
index d2c8db5f..b29712ed 100644
--- a/bureau/admin/adm_add.php
+++ b/bureau/admin/adm_add.php
@@ -65,7 +65,7 @@ if (isset($error) && $error) {
 </td></tr>
 <tr>
 	<th><label for="pass"><?php __("Initial password"); ?></label></th>
-	<td><input type="password" id="pass" name="pass" class="int" value="<?php ehe($pass); ?>" size="20" maxlength="64" /></td>
+	<td><input type="password" id="pass" name="pass" class="int" value="<?php ehe($pass); ?>" size="20" maxlength="64" /><?php display_div_generate_password(); ?></td>
 </tr>
 <tr>
 	<th><label for="passconf"><?php __("Confirm password"); ?></label></th>
diff --git a/bureau/admin/adm_edit.php b/bureau/admin/adm_edit.php
index 4e4f1040..2dfdc5e6 100644
--- a/bureau/admin/adm_edit.php
+++ b/bureau/admin/adm_edit.php
@@ -83,7 +83,7 @@ if (!$r=$admin->get($uid)) {
 
 <tr>
 	<th><label for="pass"><?php __("Password"); ?></label></th>
-	<td><input type="password" class="int" id="pass" name="pass" value="" size="20" maxlength="64" /></td>
+	<td><input type="password" class="int" id="pass" name="pass" value="" size="20" maxlength="64" /><?php display_div_generate_password(); ?></td>
 </tr>
 <tr>
 	<th><label for="passconf"><?php __("Confirm password"); ?></label></th>
diff --git a/bureau/admin/adm_mxaccount.php b/bureau/admin/adm_mxaccount.php
index 65e8f8e2..e879864f 100644
--- a/bureau/admin/adm_mxaccount.php
+++ b/bureau/admin/adm_mxaccount.php
@@ -99,8 +99,8 @@ for($i=0;$i<count($c);$i++) {
 <table class="tedit">
 <tr><th><label for="newlogin"><?php __("Login"); ?></label></th><th><label for="newpass"><?php __("Password"); ?></label></th></tr>
 <tr>
-	<td><input type="text" class="int" value="<?php ehe($newlogin); ?>" id="newlogin" name="newlogin" maxlength="64" size="32" /></td>
-	<td><input type="password" class="int" value="<?php ehe($newpass); ?>" id="newpass" name="newpass" maxlength="64" size="32" /></td>
+	<td><input type="text" class="int" value="<?php ehe($newlogin); ?>" id="newlogin" name="newlogin" maxlength="64" size="32" /><br/><br/></td>
+	<td><input type="password" class="int" value="<?php ehe($newpass); ?>" id="newpass" name="newpass" maxlength="64" size="32" /><?php display_div_generate_password(); ?></td>
 </tr>
 <tr class="trbtn"><td colspan="2">
 	<input type="submit" value="<?php __("Add this account to the allowed list"); ?>" class="inb" />
diff --git a/bureau/admin/adm_slaveaccount.php b/bureau/admin/adm_slaveaccount.php
index 0651b93d..dcdae8d5 100644
--- a/bureau/admin/adm_slaveaccount.php
+++ b/bureau/admin/adm_slaveaccount.php
@@ -99,8 +99,8 @@ for($i=0;$i<count($c);$i++) {
 <table class="tedit">
 <tr><th><label for="newlogin"><?php __("Login"); ?></label></th><th><label for="newpass"><?php __("Password"); ?></label></th></tr>
 <tr>
-	<td><input type="text" class="int" value="<?php ehe(  isset($newlogin)?$newlogin:'') ; ?>" id="newlogin" name="newlogin" maxlength="64" size="32" /></td>
-	<td><input type="password" class="int" value="<?php ehe( (isset($newpass)?$newpass:'') ) ; ?>" id="newpass" name="newpass" maxlength="64" size="32" /></td>
+	<td><input type="text" class="int" value="<?php ehe(  isset($newlogin)?$newlogin:'') ; ?>" id="newlogin" name="newlogin" maxlength="64" size="32" /><br/><br/></td>
+	<td><input type="password" class="int" value="<?php ehe( (isset($newpass)?$newpass:'') ) ; ?>" id="newpass" name="newpass" maxlength="64" size="32" /><?php display_div_generate_password(); ?></td>
 </tr>
 <tr class="trbtn"><td colspan="2">
 	<input type="submit" value="<?php __("Add this account to the allowed list"); ?>" class="inb" />
diff --git a/bureau/admin/ftp_edit.php b/bureau/admin/ftp_edit.php
index 8e5a1975..f7a2da0c 100644
--- a/bureau/admin/ftp_edit.php
+++ b/bureau/admin/ftp_edit.php
@@ -66,7 +66,7 @@ if (isset($error) && $error) {
 //  -->
 </script>
 </td></tr>
-<tr><th><label for="pass"><?php __("Password"); ?></label></th><td><input type="password" class="int" name="pass" id="pass" size="20" maxlength="64" value=""/></td></tr>
+<tr><th><label for="pass"><?php __("Password"); ?></label></th><td><input type="password" class="int" name="pass" id="pass" size="20" maxlength="64" value=""/><?php display_div_generate_password(); ?></td></tr>
 <tr><th><label for="passconf"><?php __("Confirm password"); ?></label></th><td><input type="password" class="int" name="passconf" id="passconf" size="20" maxlength="64" value=""/></td></tr>
 
 <tr class="trbtn"><td colspan="2">
diff --git a/bureau/admin/hta_adduser.php b/bureau/admin/hta_adduser.php
index f64e5e0a..abe43019 100644
--- a/bureau/admin/hta_adduser.php
+++ b/bureau/admin/hta_adduser.php
@@ -56,7 +56,7 @@ getFields($fields);
 	</tr>
 	<tr>
 		<td><label for="password"><?php __("Password"); ?></label></td>
-		<td><input type="password" class="int" name="password" id="password" value="" size="20" maxlength="64" /></td>
+		<td><input type="password" class="int" name="password" id="password" value="" size="20" maxlength="64" /><?php display_div_generate_password(); ?></td>
 	</tr>
 	<tr>
 		<td><label for="passwordconf"><?php __("Confirm password"); ?></label></td>
diff --git a/bureau/admin/hta_edit.php b/bureau/admin/hta_edit.php
index 311d2103..dfdd4dac 100644
--- a/bureau/admin/hta_edit.php
+++ b/bureau/admin/hta_edit.php
@@ -104,7 +104,7 @@ for($i=0;$i<count($r);$i++){
 	</tr>
 	<tr>
 		<td><label for="password"><?php __("Password"); ?></label></td>
-		<td><input type="password" class="int" name="password" id="password" value="" size="20" maxlength="64" /></td>
+		<td><input type="password" class="int" name="password" id="password" value="" size="20" maxlength="64" /><?php display_div_generate_password(); ?></td>
 	</tr>
 	<tr>
 		<td><label for="passwordconf"><?php __("Confirm password"); ?></label></td>
diff --git a/bureau/admin/hta_edituser.php b/bureau/admin/hta_edituser.php
index cf9dcd08..c9b3323a 100644
--- a/bureau/admin/hta_edituser.php
+++ b/bureau/admin/hta_edituser.php
@@ -51,7 +51,7 @@ if (isset($error) && $error) {
 <input type="hidden" name="user" value="<?php echo $user ?>">
 <?php __("Folder"); ?></td><td><code><?php echo $dir; ?></code></td></tr>
 <tr><td><?php __("User"); ?></td><td><code><?php echo $user; ?></code></td></tr>
-<tr><td><label for="newpass"><?php __("New password"); ?></label></td><td><input type="password" class="int" name="newpass" id="newpass" value="" size="20" maxlength="64" /></td></tr>
+<tr><td><label for="newpass"><?php __("New password"); ?></label></td><td><input type="password" class="int" name="newpass" id="newpass" value="" size="20" maxlength="64" /><?php display_div_generate_password(); ?></td></tr>
 <tr><td><label for="newpassconf"><?php __("Confirm password"); ?></label></td><td><input type="password" class="int" name="newpassconf" id="newpassconf" value="" size="20" maxlength="64" /></td></tr>
 <tr><td colspan="2"><input type="submit" class="inb" value="<?php __("Change the password"); ?>" /></td></tr>
 </table>
diff --git a/bureau/admin/mail_edit.php b/bureau/admin/mail_edit.php
index b5a6258b..d7b3e4b1 100644
--- a/bureau/admin/mail_edit.php
+++ b/bureau/admin/mail_edit.php
@@ -92,7 +92,7 @@ if (isset($error)) {
       </p>
       <div id="poptbl">
 	<table class="tedit" >
-	  <tr><td><label for="pass"><?php __("Enter a POP/IMAP password"); ?></label></td><td><input type="password" class="int" name="pass" id="pass" value="" size="20" maxlength="32" /></td></tr>
+	  <tr><td><label for="pass"><?php __("Enter a POP/IMAP password"); ?></label></td><td><input type="password" class="int" name="pass" id="pass" value="" size="20" maxlength="32" /><?php display_div_generate_password(); ?></td></tr>
 	  <tr><td><label for="passconf"><?php __("Confirm password"); ?></label></td><td><input type="password" class="int" name="passconf" id="passconf" value="" size="20" maxlength="32" /></td></tr>
 	  <tr><td><label for="quotamb"><?php __("Maximum allowed size of this Mailbox"); ?></label></td><td><input type="text" class="int intleft" style="text-align: right" name="quotamb" id="quotamb" value="<?php ehe($quotamb); ?>" size="7" maxlength="6" /><span class="int intright"><?php __("MB"); ?></span></td></tr>
 	</table>
diff --git a/bureau/admin/mem_param.php b/bureau/admin/mem_param.php
index 5fcc1f6a..10cafac2 100644
--- a/bureau/admin/mem_param.php
+++ b/bureau/admin/mem_param.php
@@ -68,7 +68,7 @@ if (!$mem->user["canpass"]) {
 <form method="post" action="mem_passwd.php" name="main" id="main">
 <table border="1" cellspacing="0" cellpadding="4" class="tedit" >
 <tr><th><?php __("Old password"); ?></th><td><input type="password" class="int" name="oldpass" value="<?php isset($oldpass) ? : $oldpass=""; echo $oldpass; ?>" size="20" maxlength="128" /></td></tr>
-<tr><th><?php __("New password"); ?> (1)</th><td><input type="password" class="int" name="newpass" value="<?php isset($newpass) ? : $newpass=""; echo $newpass;  ?>" size="20" maxlength="60" /></td></tr>
+<tr><th><?php __("New password"); ?> (1)</th><td><input type="password" class="int" name="newpass" value="<?php isset($newpass) ? : $newpass=""; echo $newpass;  ?>" size="20" maxlength="60" /><?php display_div_generate_password(); ?></td></tr>
 <tr><th><?php __("New password"); ?> (2)</th><td><input type="password" class="int" name="newpass2" value="<?php isset($newpass2) ? : $newpass2=""; echo $newpass2;?>" size="20" maxlength="61" /></td></tr>
 <tr class="trbtn"><td colspan="3"><input type="submit" class="inb" name="submit" value="<?php __("Change my password"); ?>" /></td></tr>
 </table>
diff --git a/bureau/admin/sql_users_add.php b/bureau/admin/sql_users_add.php
index e165013d..4e1651a0 100644
--- a/bureau/admin/sql_users_add.php
+++ b/bureau/admin/sql_users_add.php
@@ -61,7 +61,7 @@ getFields($fields);
 </tr>
 <tr>
   <th><label for="password"><?php __("Password"); ?></label></th>
-  <td><input type="password" class="int" name="password" id="password" size="26"/></td>
+  <td><input type="password" class="int" name="password" id="password" size="26"/><?php display_div_generate_password(); ?></td>
 </tr>
 <tr>
   <th><label for="password"><?php __("Confirm password"); ?></label></th>
diff --git a/bureau/admin/sql_users_password.php b/bureau/admin/sql_users_password.php
index 28eb65ba..3c3d9166 100644
--- a/bureau/admin/sql_users_password.php
+++ b/bureau/admin/sql_users_password.php
@@ -53,7 +53,7 @@ $r=$mysql->get_user_dblist($id);
 <table cellspacing="0" cellpadding="4">
   <tr>
     <td><label for="password"><?php __("Password"); ?></label></td>
-    <td><input type="password" class="int" name="password" id="password" value="" size="20" maxlength="64" /></td>
+    <td><input type="password" class="int" name="password" id="password" value="" size="20" maxlength="64" /><?php display_div_generate_password(); ?></td>
   </tr>
   <tr>
     <td><label for="passwordconf"><?php __("Confirm password"); ?></label></td>