diff --git a/interface/web/themes/default-v2/templates/admin/remote_user_edit.htm b/interface/web/themes/default-v2/templates/admin/remote_user_edit.htm
index 8bdb61f7313d341eb145e2a3638bb87e459ad1ca..1b7d22a5c4df14c1fe7a6a50f03d0240b3239b40 100644
--- a/interface/web/themes/default-v2/templates/admin/remote_user_edit.htm
+++ b/interface/web/themes/default-v2/templates/admin/remote_user_edit.htm
@@ -13,7 +13,7 @@
                 
             <div class="ctrlHolder">
                 <label for="remote_password">{tmpl_var name='password_txt'}</label>
-                <input name="remote_password" id="password" value="{tmpl_var name='remote_password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+                <input name="remote_password" id="password" value="{tmpl_var name='remote_password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
             </div>
             <div class="ctrlHolder">
                 <p class="label">{tmpl_var name='password_strength_txt'}</p>
diff --git a/interface/web/themes/default-v2/templates/client/client_edit_address.htm b/interface/web/themes/default-v2/templates/client/client_edit_address.htm
index 8ca7bce5a136152e2118eda034407c8c189a3430..076f4b021f86b97f2cc7eb5c14391fa3b8669ab3 100644
--- a/interface/web/themes/default-v2/templates/client/client_edit_address.htm
+++ b/interface/web/themes/default-v2/templates/client/client_edit_address.htm
@@ -23,7 +23,7 @@
             </div>
             <div class="ctrlHolder">
                 <label for="password">{tmpl_var name='password_txt'}</label>
-                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
             </div>
             <div class="ctrlHolder">
                 <p class="label">{tmpl_var name='password_strength_txt'}</p>
diff --git a/interface/web/themes/default-v2/templates/client/reseller_edit_address.htm b/interface/web/themes/default-v2/templates/client/reseller_edit_address.htm
index 5ab15353ab89ebc99b676fde7bb37e6d59d07080..d58ee93b7ea03073bacc060ff6ca4d9a6cb006a2 100644
--- a/interface/web/themes/default-v2/templates/client/reseller_edit_address.htm
+++ b/interface/web/themes/default-v2/templates/client/reseller_edit_address.htm
@@ -23,7 +23,7 @@
             </div>
             <div class="ctrlHolder">
                 <label for="password">{tmpl_var name='password_txt'}</label>
-                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
             </div>
             <div class="ctrlHolder">
                 <p class="label">{tmpl_var name='password_strength_txt'}</p>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_mailinglist_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_mailinglist_edit.htm
index e5b335c699d069afc2e4fe86c7781c813bf62ad0..04964c70e2d080d5a47b3c58bbebb7682af05cb9 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_mailinglist_edit.htm
+++ b/interface/web/themes/default-v2/templates/mail/mail_mailinglist_edit.htm
@@ -60,7 +60,7 @@
             </tmpl_if>
             <div class="ctrlHolder">
                 <label for="password">{tmpl_var name='password_txt'}</label>
-                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
             </div>
             <div class="ctrlHolder">
                 <p class="label">{tmpl_var name='password_strength_txt'}</p>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_mailbox_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_user_mailbox_edit.htm
index faba29d47dbeff4d669520c8dd6d3abe39f58037..bb1dd37ba0de44d744a9c8afba2e0c5e4dfa6f9c 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_user_mailbox_edit.htm
+++ b/interface/web/themes/default-v2/templates/mail/mail_user_mailbox_edit.htm
@@ -23,7 +23,7 @@
                 </div></tmpl_if>
             <div class="ctrlHolder">
                 <label for="password">{tmpl_var name='password_txt'}</label>
-                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
             </div>
             <div class="ctrlHolder">
                 <p class="label">{tmpl_var name='password_strength_txt'}</p>
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_password_edit.htm b/interface/web/themes/default-v2/templates/mailuser/mail_user_password_edit.htm
index 2b91842c80b013b91e9cd16db2b0811424ad924d..ed49c1654bd9c489d03f49706c893066f11ff90c 100644
--- a/interface/web/themes/default-v2/templates/mailuser/mail_user_password_edit.htm
+++ b/interface/web/themes/default-v2/templates/mailuser/mail_user_password_edit.htm
@@ -11,7 +11,7 @@
             </div>
             <div class="ctrlHolder">
                 <label for="password">{tmpl_var name='password_txt'}</label>
-                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
             </div>
             <div class="ctrlHolder">
                 <p class="label">{tmpl_var name='password_strength_txt'}</p>
diff --git a/interface/web/themes/default-v2/templates/sites/ftp_user_edit.htm b/interface/web/themes/default-v2/templates/sites/ftp_user_edit.htm
index 25ea62953f80c88ec11f73a8d7e776f4fb62c81d..cf900015c9993a68f0dc772d84affadf4a020768 100644
--- a/interface/web/themes/default-v2/templates/sites/ftp_user_edit.htm
+++ b/interface/web/themes/default-v2/templates/sites/ftp_user_edit.htm
@@ -18,7 +18,7 @@
             </div>
             <div class="ctrlHolder">
                 <label for="password">{tmpl_var name='password_txt'}</label>
-                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
             </div>
             <div class="ctrlHolder">
                 <p class="label">{tmpl_var name='password_strength_txt'}</p>
diff --git a/interface/web/themes/default-v2/templates/sites/shell_user_edit.htm b/interface/web/themes/default-v2/templates/sites/shell_user_edit.htm
index 554dbb99338d11bc3e92afb27efd74efdda8315e..3cb5d3842417936149ab877a0bc523815349fe76 100644
--- a/interface/web/themes/default-v2/templates/sites/shell_user_edit.htm
+++ b/interface/web/themes/default-v2/templates/sites/shell_user_edit.htm
@@ -26,7 +26,7 @@
             </div>
             <div class="ctrlHolder">
                 <label for="password">{tmpl_var name='password_txt'}</label>
-                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
             </div>
             <div class="ctrlHolder">
                 <p class="label">{tmpl_var name='password_strength_txt'}</p>
diff --git a/interface/web/themes/default-v2/templates/sites/web_folder_user_edit.htm b/interface/web/themes/default-v2/templates/sites/web_folder_user_edit.htm
index 1e9cae1a0b696e63edd60f7a7023e7b2a9dea746..63376d8ed8377a84b5029dcb94064c7227716ec4 100644
--- a/interface/web/themes/default-v2/templates/sites/web_folder_user_edit.htm
+++ b/interface/web/themes/default-v2/templates/sites/web_folder_user_edit.htm
@@ -17,7 +17,7 @@
             </div>
             <div class="ctrlHolder">
                 <label for="password">{tmpl_var name='password_txt'}</label>
-                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
             </div>
             <div class="ctrlHolder">
                 <p class="label">{tmpl_var name='password_strength_txt'}</p>
diff --git a/interface/web/themes/default-v2/templates/sites/webdav_user_edit.htm b/interface/web/themes/default-v2/templates/sites/webdav_user_edit.htm
index 7a110c7468375e0cee007e2aa03ba924f2ad459d..8dd719dca16363d21d4e47ea339cef3df5f40575 100644
--- a/interface/web/themes/default-v2/templates/sites/webdav_user_edit.htm
+++ b/interface/web/themes/default-v2/templates/sites/webdav_user_edit.htm
@@ -26,7 +26,7 @@
             </div>
             <div class="ctrlHolder">
                 <label for="password">{tmpl_var name='password_txt'}</label>
-                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
             </div>
             <div class="ctrlHolder">
                 <p class="label">{tmpl_var name='password_strength_txt'}</p>