diff --git a/interface/web/admin/lib/lang/de_remote_user.lng b/interface/web/admin/lib/lang/de_remote_user.lng
index cdebf695d649f9afa06bbd79857b383f90b4716c..3bf7e62197fefddcf089bc1b2471fcdde15455fe 100644
--- a/interface/web/admin/lib/lang/de_remote_user.lng
+++ b/interface/web/admin/lib/lang/de_remote_user.lng
@@ -40,4 +40,5 @@ $wb['DNS rp functions'] = 'DNS rp Funktionen';
 $wb['DNS srv functions'] = 'DNS srv Funktionen';
 $wb['DNS txt functions'] = 'DNS txt Funktionen';
 $wb['Mail mailing list functions'] = 'Mail mailinglist functions';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
 ?>
diff --git a/interface/web/admin/lib/lang/de_users.lng b/interface/web/admin/lib/lang/de_users.lng
index 512b764e621cf4436eea983a93fb64d92b6cd1b1..6145d1f6a8a439f6ae6df7f0830900e164cf0b1c 100644
--- a/interface/web/admin/lib/lang/de_users.lng
+++ b/interface/web/admin/lib/lang/de_users.lng
@@ -25,4 +25,5 @@ $wb['username_empty'] = 'Der Benutzername ist leer';
 $wb['username_unique'] = 'Es gibt bereits einen Benutzer mit diesem Namen';
 $wb['startmodule_err'] = 'Start Modul ist nicht innerhalb der Module.';
 $wb['password_strength_txt'] = 'Passwortkomplexität';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
 ?>
diff --git a/interface/web/admin/lib/lang/en_remote_user.lng b/interface/web/admin/lib/lang/en_remote_user.lng
index 3a47fbfca3172679ef7894dc10ccbdfcc3e15557..6883c11deb4b6b14bdead744255cedc02598b9ab 100644
--- a/interface/web/admin/lib/lang/en_remote_user.lng
+++ b/interface/web/admin/lib/lang/en_remote_user.lng
@@ -40,4 +40,5 @@ $wb['DNS ptr functions'] = 'DNS ptr functions';
 $wb['DNS rp functions'] = 'DNS rp functions';
 $wb['DNS srv functions'] = 'DNS srv functions';
 $wb['DNS txt functions'] = 'DNS txt functions';
+$wb['generate_password_txt'] = 'Generate Password';
 ?>
diff --git a/interface/web/admin/lib/lang/en_users.lng b/interface/web/admin/lib/lang/en_users.lng
index df0043881168040445f1f0de2e32c60b7a74c872..573f18a67b4db846bd9131f7126dd20a719b25de 100644
--- a/interface/web/admin/lib/lang/en_users.lng
+++ b/interface/web/admin/lib/lang/en_users.lng
@@ -25,4 +25,5 @@ $wb["fax_txt"] = 'Fax';
 $wb["groups_txt"] = 'Groups';
 $wb["default_group_txt"] = 'Default Group';
 $wb["startmodule_err"] = 'Start module is not within modules.';
+$wb['generate_password_txt'] = 'Generate Password';
 ?>
diff --git a/interface/web/admin/templates/remote_user_edit.htm b/interface/web/admin/templates/remote_user_edit.htm
index 36f11e1d0f26be1674eeedcb965bfc54e0a20e88..945a2971483dbc0201814d7c8e700ab974ae8e42 100644
--- a/interface/web/admin/templates/remote_user_edit.htm
+++ b/interface/web/admin/templates/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)" />
+        <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)" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('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/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm
index f16e9ebf352e5a3c65bb1dbef63a35b6c951bdfa..40622ef25555d962d997b04a2863ae05191d0370 100644
--- a/interface/web/admin/templates/users_user_edit.htm
+++ b/interface/web/admin/templates/users_user_edit.htm
@@ -11,7 +11,7 @@
 			</div>
       <div class="ctrlHolder">
       	<label for="passwort">{tmpl_var name='passwort_txt'}</label>
-        <input name="passwort" id="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" type="password" class="textInput"  onkeyup="pass_check(this.value)"/>
+        <input name="passwort" id="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" type="password" class="textInput"  onkeyup="pass_check(this.value)"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('passwort');">{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/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index 46c41a8c795adbd7fda142166b42596f67f512cf..88adbff4b8f80762e86a8ff812c194d775d1f955 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -118,4 +118,5 @@ $wb["database_limits_txt"] = 'Datenbank-Limits';
 $wb["cron_job_limits_txt"] = 'Cron Job-Limits';
 $wb["dns_limits_txt"] = 'DNS-Limits';
 $wb["virtualization_limits_txt"] = 'Virtualisierungs-Limits';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
 ?>
diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng
index 0664e88bf6d4de1e0aa303d14044b02901225733..e938cde1860b47eda62c05fe06f2f90c864dd14b 100644
--- a/interface/web/client/lib/lang/de_reseller.lng
+++ b/interface/web/client/lib/lang/de_reseller.lng
@@ -113,4 +113,5 @@ $wb["database_limits_txt"] = 'Datenbank-Limits';
 $wb["cron_job_limits_txt"] = 'Cron Job-Limits';
 $wb["dns_limits_txt"] = 'DNS-Limits';
 $wb["virtualization_limits_txt"] = 'Virtualisierungs-Limits';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
 ?>
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index 3a9f30e31df8e26272f428fd1b9c1fda030479bd..d8b3c2c88c561013e314fd21a253c772c9c489ea 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -121,4 +121,5 @@ $wb["database_limits_txt"] = 'Database Limits';
 $wb["cron_job_limits_txt"] = 'Cron Job Limits';
 $wb["dns_limits_txt"] = 'DNS Limits';
 $wb["virtualization_limits_txt"] = 'Virtualization Limits';
+$wb['generate_password_txt'] = 'Generate Password';
 ?>
diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng
index 4863a4eb09a62b917ab306def6ab9a82870092c9..ba2e7bbdd01c04e59fcc0eef0c9a7ebe92aaa1ca 100644
--- a/interface/web/client/lib/lang/en_reseller.lng
+++ b/interface/web/client/lib/lang/en_reseller.lng
@@ -115,4 +115,5 @@ $wb["database_limits_txt"] = 'Database Limits';
 $wb["cron_job_limits_txt"] = 'Cron Job Limits';
 $wb["dns_limits_txt"] = 'DNS Limits';
 $wb["virtualization_limits_txt"] = 'Virtualization Limits';
+$wb['generate_password_txt'] = 'Generate Password';
 ?>
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm
index ec752f84fe7888c695653f7acc23ef73c81c3e38..5799d863daf53ef13e11ff4c4187b4f283764f15 100644
--- a/interface/web/client/templates/client_edit_address.htm
+++ b/interface/web/client/templates/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)" />
+        <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value)" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('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/client/templates/reseller_edit_address.htm b/interface/web/client/templates/reseller_edit_address.htm
index 08c79998f609e01eea033b606f39310e6887a2e9..0458aa8d304ead19c960bcc6554d3d7a54d2a8e6 100644
--- a/interface/web/client/templates/reseller_edit_address.htm
+++ b/interface/web/client/templates/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)" />
+        <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value)" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('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/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index 6fa893b4bc9d8add194ff350525fb88fa883c530..cc6a80f9d6dcb837c9446fc43a630be2899ba38b 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -526,11 +526,13 @@ function getInternetExplorerVersion() {
     return rv;
 }
 
-function password(length, special) {
+function password(minLength, special){
 	var iteration = 0;
 	var password = "";
 	var randomNumber;
-	length = length || 10;
+	minLength = minLength || 10;
+	var maxLength = minLength + 5;
+	var length = getRandomInt(minLength, maxLength);
 	if(special == undefined){
 		var special = false;
 	}
@@ -555,3 +557,8 @@ function generatePassword(passwordFieldID){
 	oldPWField.remove();
 	newPWField.attr('id', passwordFieldID).val(password(10, true)).trigger('keyup');
 }
+
+function getRandomInt(min, max){
+    return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+
diff --git a/interface/web/mail/lib/lang/de_mail_mailinglist.lng b/interface/web/mail/lib/lang/de_mail_mailinglist.lng
index d9c3059f1e8dd4fc7b3ec01ea11c996d883e679c..b9dbb7def008aaa41553077b2a24af8d9ba02a51 100644
--- a/interface/web/mail/lib/lang/de_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/de_mail_mailinglist.lng
@@ -12,4 +12,5 @@ $wb['listname_txt'] = 'Listname';
 $wb['client_txt'] = 'Client';
 $wb['email_txt'] = 'Email';
 $wb['password_txt'] = 'Password';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng
index 1d2fd3b16eb00c1da23a243326f555698e01e28e..a85637bdb827135a4935cf996eb5a79db43efe5a 100644
--- a/interface/web/mail/lib/lang/de_mail_user.lng
+++ b/interface/web/mail/lib/lang/de_mail_user.lng
@@ -41,4 +41,5 @@ $wb['login_txt'] = 'Login';
 $wb['error_login_email_txt'] = 'Dieser Loginname ist nicht zulässig. Bitte verwenden Sie einen anderen Loginnamen oder die E-Mail-Adresse als Login.';
 $wb['domain_txt'] = 'Domain';
 $wb['now_txt'] = 'Now';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
 ?>
diff --git a/interface/web/mail/lib/lang/en_mail_mailinglist.lng b/interface/web/mail/lib/lang/en_mail_mailinglist.lng
index f7ada3e384d677d5e23ccc222f5d27654ea95f22..57c6fbb1b51c4ec99372f07080fd6a5a03aae629 100644
--- a/interface/web/mail/lib/lang/en_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/en_mail_mailinglist.lng
@@ -12,4 +12,5 @@ $wb["listname_txt"] = 'Listname';
 $wb["client_txt"] = 'Client';
 $wb["email_txt"] = 'Email';
 $wb["password_txt"] = 'Password';
+$wb['generate_password_txt'] = 'Generate Password';
 ?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/en_mail_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng
index 65c810f7a231e0fa6d2b3525fc394f16d905ceb3..b154973435178bf3a06667842717699c9353153f 100644
--- a/interface/web/mail/lib/lang/en_mail_user.lng
+++ b/interface/web/mail/lib/lang/en_mail_user.lng
@@ -43,4 +43,5 @@ $wb['login_error_unique'] = 'Login is already taken.';
 $wb['login_error_regex'] = 'Valid characters are A-Z, a-z, 0-9, ., _ and -.';
 $wb['login_txt'] = 'Login';
 $wb['error_login_email_txt'] = 'This login is not allowed. Please enter a different login or use the mail address as login.';
+$wb['generate_password_txt'] = 'Generate Password';
 ?>
diff --git a/interface/web/mail/templates/mail_mailinglist_edit.htm b/interface/web/mail/templates/mail_mailinglist_edit.htm
index bbf993df9266dc8c6a64825b37a4af130a4fb1eb..507224023857346476e416476a0aa92e7caaf414 100644
--- a/interface/web/mail/templates/mail_mailinglist_edit.htm
+++ b/interface/web/mail/templates/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)" />
+			<input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value)" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('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/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
index ff3d0867b941b139b3aa2d9020e9b52ee8ff9903..9a89f1e7fd205aed8b8bdc555134e41114e22a26 100644
--- a/interface/web/mail/templates/mail_user_mailbox_edit.htm
+++ b/interface/web/mail/templates/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)" />
+        <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value)" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('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/tools/lib/lang/de_usersettings.lng b/interface/web/tools/lib/lang/de_usersettings.lng
index d52f8e8c7070c174be4ff7c51cf2a8b8afa397e6..1b09f36758c57f624665c46f173f9edb25a6e3bc 100644
--- a/interface/web/tools/lib/lang/de_usersettings.lng
+++ b/interface/web/tools/lib/lang/de_usersettings.lng
@@ -5,4 +5,5 @@ $wb['password_mismatch'] = 'Die Passw&ouml;rter stimmen nicht &uuml;berein.';
 $wb['password_strength_txt'] = 'Passwortkomplexit&auml;t';
 $wb['Form to edit the user password and language.'] = 'Formular, um das Benutzerpasswort und die Sprache zu bearbeiten.';
 $wb['Settings'] = 'Einstellungen';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
 ?>
diff --git a/interface/web/tools/lib/lang/en_usersettings.lng b/interface/web/tools/lib/lang/en_usersettings.lng
index bfe487113b715886e4e5511818ab9c4b0a55ee76..f864944fdf3ca4cd59dfa876857e0deba2e4ec16 100644
--- a/interface/web/tools/lib/lang/en_usersettings.lng
+++ b/interface/web/tools/lib/lang/en_usersettings.lng
@@ -5,4 +5,5 @@ $wb["language_txt"] = 'Language';
 $wb["password_mismatch"] = 'The password in the second password field does not match the first password.';
 $wb["Form to edit the user password and language."] = 'Form to edit the user password and language.';
 $wb["Settings"] = 'Settings';
+$wb['generate_password_txt'] = 'Generate Password';
 ?>
diff --git a/interface/web/tools/templates/user_settings.htm b/interface/web/tools/templates/user_settings.htm
index 969c21b2baca6f6cf94c33ab41b8c11bfda2ede1..e7c0144793daf1836499f1f88b61c9825a238293 100644
--- a/interface/web/tools/templates/user_settings.htm
+++ b/interface/web/tools/templates/user_settings.htm
@@ -7,7 +7,7 @@
     <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="passwort">{tmpl_var name='passwort_txt'}</label>
-        <input name="passwort" id="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" type="password" class="textInput" onkeyup="pass_check(this.value)"/>
+        <input name="passwort" id="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" type="password" class="textInput" onkeyup="pass_check(this.value)"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('passwort');">{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/vm/lib/lang/de_openvz_vm.lng b/interface/web/vm/lib/lang/de_openvz_vm.lng
index 5880ce4cf35071bf41a7b94a3077c21cfadfdb14..ee70a9834b44d3817453c1f744739ed67013d4b0 100644
--- a/interface/web/vm/lib/lang/de_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/de_openvz_vm.lng
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O Priorit&auml;t ist leer.';
 $wb['template_nameserver_error_empty'] = 'Nameserver ist leer.';
 $wb['Virtual server'] = 'Virtueller Server';
 $wb['Advanced'] = 'Erweitert';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
 ?>
diff --git a/interface/web/vm/lib/lang/en_openvz_vm.lng b/interface/web/vm/lib/lang/en_openvz_vm.lng
index ddd9903ced01c0ce6207e4373a36b70e0c2c2bf1..1594fb4d4fd1d91d5080eb140b9e989391cbf4a7 100644
--- a/interface/web/vm/lib/lang/en_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/en_openvz_vm.lng
@@ -37,4 +37,5 @@ $wb["io_priority_error_empty"] = 'I/O priority is empty.';
 $wb["template_nameserver_error_empty"] = 'Nameserver(s) is empty.';
 $wb["Virtual server"] = 'Virtual server';
 $wb["Advanced"] = 'Advanced';
+$wb['generate_password_txt'] = 'Generate Password';
 ?>
\ No newline at end of file
diff --git a/interface/web/vm/templates/openvz_vm_edit.htm b/interface/web/vm/templates/openvz_vm_edit.htm
index c6615709c5bd1714786a74ea218f7b4afbb2217d..671fd7000a52c29f55ad950561102b833ea79c4d 100644
--- a/interface/web/vm/templates/openvz_vm_edit.htm
+++ b/interface/web/vm/templates/openvz_vm_edit.htm
@@ -69,7 +69,7 @@
 			</div>
       <div class="ctrlHolder">
       	<label for="vm_password">{tmpl_var name='vm_password_txt'}</label>
-        <input name="vm_password" id="vm_password" value="{tmpl_var name='vm_password'}" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="vm_password" id="vm_password" value="{tmpl_var name='vm_password'}" size="30" maxlength="255" type="text" class="textInput" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('vm_password');">{tmpl_var name='generate_password_txt'}</a>
 			</div>
       <div class="ctrlHolder">
 				<p class="label">{tmpl_var name='start_boot_txt'}</p>