diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index f8120e8372ac72b86fae019733925e6dcd752709..6fa893b4bc9d8add194ff350525fb88fa883c530 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -525,3 +525,33 @@ function getInternetExplorerVersion() {
     }
     return rv;
 }
+
+function password(length, special) {
+	var iteration = 0;
+	var password = "";
+	var randomNumber;
+	length = length || 10;
+	if(special == undefined){
+		var special = false;
+	}
+	while(iteration < length){
+		randomNumber = (Math.floor((Math.random() * 100)) % 94) + 33;
+		if(!special){
+			if ((randomNumber >=33) && (randomNumber <=47)) { continue; }
+			if ((randomNumber >=58) && (randomNumber <=64)) { continue; }
+			if ((randomNumber >=91) && (randomNumber <=96)) { continue; }
+			if ((randomNumber >=123) && (randomNumber <=126)) { continue; }
+		}
+		iteration++;
+		password += String.fromCharCode(randomNumber);
+	}
+	return password;
+}
+
+function generatePassword(passwordFieldID){
+	var oldPWField = jQuery('#'+passwordFieldID);
+	var newPWField = oldPWField.clone();
+	newPWField.attr('type', 'text').attr('id', 'tmp'+passwordFieldID).insertBefore(oldPWField);
+	oldPWField.remove();
+	newPWField.attr('id', passwordFieldID).val(password(10, true)).trigger('keyup');
+}
diff --git a/interface/web/sites/lib/lang/de_database.lng b/interface/web/sites/lib/lang/de_database.lng
index f604997ba3c045da3271aca0927e7ac1f3eaa593..dce54bb3c16490805895560eb3e7540d2f3c5087 100644
--- a/interface/web/sites/lib/lang/de_database.lng
+++ b/interface/web/sites/lib/lang/de_database.lng
@@ -22,4 +22,5 @@ $wb['database_charset_change_txt'] = 'Der Zeichensatz der Datenbank kann nicht g
 $wb['password_strength_txt'] = 'Passwortkomplexität';
 $wb['database_name_error_len'] = 'Datenbank Name - {db} - zu lang. Die max. Datenbank Namen Länge inkl. Präfix ist 64 Zeichen.';
 $wb['database_user_error_len'] = 'Datenbank Benutzername - {user}- zu lang. Die max. Datenbank Benutzernamen Länge inkl. Präfix ist 16 Zeichen.';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
 ?>
diff --git a/interface/web/sites/lib/lang/de_ftp_user.lng b/interface/web/sites/lib/lang/de_ftp_user.lng
index 458cf382abe78d77dfe1456caf668030ccc0c81c..13af049247f7528d16d2185618b1d272005395ea 100644
--- a/interface/web/sites/lib/lang/de_ftp_user.lng
+++ b/interface/web/sites/lib/lang/de_ftp_user.lng
@@ -24,7 +24,8 @@ $wb['directory_error_empty'] = 'Verzeichnis ist leer.';
 $wb['password_strength_txt'] = 'Passwortkomplexität';
 $wb['directory_error_notinweb'] = 'Das Verzeichnis befindet sich nicht innerhalb des Verzeichnisses der Website.';
 $wb['parent_domain_id_error_empty'] = 'Keine Domain ausgewählt.';
-$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
-$wb['dir_dot_error'] = 'No .. in path allowed.';
-$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
+$wb['quota_size_error_regex'] = 'Quota: Geben Sie -1 ein für unlimitiert oder eine Nummer > 0';
+$wb['dir_dot_error'] = 'Kein .. im Pfad erlaubt.';
+$wb['dir_slashdot_error'] = 'Kein ./ im Pfad erlaubt.';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
 ?>
diff --git a/interface/web/sites/lib/lang/de_shell_user.lng b/interface/web/sites/lib/lang/de_shell_user.lng
index ebd5cfe66b5a03dcb102ed067a581f60b9debab8..fb0a3303880a8a06e20cb5ac2e54425a694fc9ee 100644
--- a/interface/web/sites/lib/lang/de_shell_user.lng
+++ b/interface/web/sites/lib/lang/de_shell_user.lng
@@ -20,6 +20,7 @@ $wb['parent_domain_id_error_empty'] = 'Keine Website ausgewählt.';
 $wb['puser_txt'] = 'Web Username';
 $wb['pgroup_txt'] = 'Web Group';
 $wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (f&uuml;r key-basierte Logins)';
-$wb['dir_dot_error'] = 'No .. in path allowed.';
-$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
+$wb['dir_dot_error'] = 'Kein .. im Pfad erlaubt.';
+$wb['dir_slashdot_error'] = 'Kein ./ im Pfad erlaubt.';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
 ?>
diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng
index 6f941db93a0ff61d64f1ee7d3a1eea80fb7247b7..4fb8bed3318d4281bfeafbfdf5464878dae85623 100644
--- a/interface/web/sites/lib/lang/de_web_domain.lng
+++ b/interface/web/sites/lib/lang/de_web_domain.lng
@@ -98,4 +98,5 @@ $wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
 $wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout mu&szlig; eine positive ganze Zahl sein.';
 $wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests mu&szlig; eine ganze Zahl >= 0 sein.';
 $wb["pm_ondemand_hint_txt"] = 'Bitte beachten Sie, daß Ihre PHP-Version >= 5.3.9 sein muß, wenn Sie den ondemand Process-Manager nutzen möchten. Wenn Sie ondemand für eine ältere PHP-Version auswählen, wird PHP nicht mehr starten!';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
 ?>
diff --git a/interface/web/sites/lib/lang/de_web_folder_user.lng b/interface/web/sites/lib/lang/de_web_folder_user.lng
index f877df2092809ce4d16790620f018ad661bdfe22..e53e007331b21cea05eae556dabebc0ba6c00395 100644
--- a/interface/web/sites/lib/lang/de_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/de_web_folder_user.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['web_folder_id_txt'] = 'Folder';
+$wb['web_folder_id_txt'] = 'Ordner';
 $wb['username_txt'] = 'Username';
-$wb['password_txt'] = 'Password';
-$wb['active_txt'] = 'Active';
-$wb['folder_error_empty'] = 'No web folder selecetd.';
+$wb['password_txt'] = 'Passwort';
+$wb['active_txt'] = 'Aktiv';
+$wb['folder_error_empty'] = 'Kein Web-Ordner ausgewählt.';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
 ?>
diff --git a/interface/web/sites/lib/lang/de_webdav_user.lng b/interface/web/sites/lib/lang/de_webdav_user.lng
index ec4f26b21e7e510822baebe3e0139955291cbe40..e69877556621eba4c1b2c0c780ed46ea6d00b665 100644
--- a/interface/web/sites/lib/lang/de_webdav_user.lng
+++ b/interface/web/sites/lib/lang/de_webdav_user.lng
@@ -12,6 +12,7 @@ $wb['username_error_unique'] = 'Der Benutzername muss einzigartig sein.';
 $wb['username_error_regex'] = 'Der Benutzername enthält nicht erlaubte Zeichen.';
 $wb['directory_error_empty'] = 'Verzeichnis ist leer.';
 $wb['parent_domain_id_error_empty'] = 'Keine Website ausgewählt.';
-$wb['dir_dot_error'] = 'No .. in path allowed.';
-$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
+$wb['dir_dot_error'] = 'Kein .. im Pfad erlaubt.';
+$wb['dir_slashdot_error'] = 'Kein ./ im Pfad erlaubt.';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
 ?>
diff --git a/interface/web/sites/lib/lang/en_database.lng b/interface/web/sites/lib/lang/en_database.lng
index abf302ec647495a3f53f08b9e24676bfe9aabd65..8c12d11018b18db32f75f34060ba61e962f4eaf3 100644
--- a/interface/web/sites/lib/lang/en_database.lng
+++ b/interface/web/sites/lib/lang/en_database.lng
@@ -27,4 +27,5 @@ $wb["database_site_error_empty"] = 'Select the site to which the database belong
 $wb["select_site_txt"] = '- Select Site -';
 $wb["btn_save_txt"] = 'Save';
 $wb["btn_cancel_txt"] = 'Cancel';
+$wb['generate_password_txt'] = 'Generate Password';
 ?>
diff --git a/interface/web/sites/lib/lang/en_ftp_user.lng b/interface/web/sites/lib/lang/en_ftp_user.lng
index 4598b03c692a42ffe84607049e77d745101b0ef9..580f8294d46f9a5eb18ccb670965e7d6677726c0 100644
--- a/interface/web/sites/lib/lang/en_ftp_user.lng
+++ b/interface/web/sites/lib/lang/en_ftp_user.lng
@@ -28,4 +28,5 @@ $wb["parent_domain_id_error_empty"] = 'No website selected.';
 $wb["quota_size_error_regex"] = 'Quota: enter a -1 for unlimited or a number > 0';
 $wb['dir_dot_error'] = 'No .. in path allowed.';
 $wb['dir_slashdot_error'] = 'No ./ in path allowed.';
+$wb['generate_password_txt'] = 'Generate Password';
 ?>
diff --git a/interface/web/sites/lib/lang/en_shell_user.lng b/interface/web/sites/lib/lang/en_shell_user.lng
index b703ad04bdfeb6eeed4af39da6fcdaee4d418a05..1f7d61e406d084c2310d0371fe0f91a7de3601f7 100644
--- a/interface/web/sites/lib/lang/en_shell_user.lng
+++ b/interface/web/sites/lib/lang/en_shell_user.lng
@@ -23,4 +23,5 @@ $wb["parent_domain_id_error_empty"] = 'No website selected.';
 $wb["ssh_rsa_txt"] = 'SSH-RSA Public Key (for key-based logins)';
 $wb['dir_dot_error'] = 'No .. in path allowed.';
 $wb['dir_slashdot_error'] = 'No ./ in path allowed.';
+$wb['generate_password_txt'] = 'Generate Password';
 ?>
diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng
index b16af757aa8d2997a3574b61e0b7c1ea197b2bc7..a6169ce909a9d0981f2edeb22aecc93be11c1105 100644
--- a/interface/web/sites/lib/lang/en_web_domain.lng
+++ b/interface/web/sites/lib/lang/en_web_domain.lng
@@ -98,4 +98,5 @@ $wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
 $wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
 $wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
 $wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
 ?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/en_web_folder_user.lng b/interface/web/sites/lib/lang/en_web_folder_user.lng
index 3b553e94c6ed8cb4a0600c8d1a5e57c7e575e496..684c0e92f01a09adc8f2ed1b07ff463c6ca67e8c 100644
--- a/interface/web/sites/lib/lang/en_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/en_web_folder_user.lng
@@ -4,4 +4,5 @@ $wb["username_txt"] = 'Username';
 $wb["password_txt"] = 'Password';
 $wb["active_txt"] = 'Active';
 $wb["folder_error_empty"] = 'No web folder selecetd.';
+$wb['generate_password_txt'] = 'Generate Password';
 ?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/en_webdav_user.lng b/interface/web/sites/lib/lang/en_webdav_user.lng
index 3d43cfc5aad99f7d5c26785192557ddc76085472..af84617f8b8f9afe29b86ebe8c7420b66b5359df 100644
--- a/interface/web/sites/lib/lang/en_webdav_user.lng
+++ b/interface/web/sites/lib/lang/en_webdav_user.lng
@@ -15,4 +15,5 @@ $wb["parent_domain_id_error_empty"] = 'No website selected.';
 $wb['password_strength_txt'] = 'Password strength';
 $wb['dir_dot_error'] = 'No .. in path allowed.';
 $wb['dir_slashdot_error'] = 'No ./ in path allowed.';
+$wb['generate_password_txt'] = 'Generate Password';
 ?>
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index 59b1bff77fd04106384601919c92891175b9a95f..9b0cd22eba7cb840f39629ffba7fcbdbb6ae897a 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -50,7 +50,7 @@
 			</div>
       <div class="ctrlHolder">
       	<label for="database_password">{tmpl_var name='database_password_txt'}</label>
-        <input name="database_password" id="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" type="password" class="textInput formLengthHalf" onkeyup="pass_check(this.value)" />
+        <input name="database_password" id="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" type="password" class="textInput formLengthHalf" onkeyup="pass_check(this.value)" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('database_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/sites/templates/ftp_user_edit.htm b/interface/web/sites/templates/ftp_user_edit.htm
index d3c6d78963bde7a54172975214c1434f96519625..e07526fe2a6dfbe0f342af234b072c8631a8e20a 100644
--- a/interface/web/sites/templates/ftp_user_edit.htm
+++ b/interface/web/sites/templates/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)" />
+        <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>
@@ -45,4 +45,4 @@
     </div>
   </div>
   
-</div>
+</div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm
index 3924d39e719aa276695fc3710ed5145274c27f07..0f2bc11f3c3f9c31ad56e0a92b1a60529bb2eb08 100644
--- a/interface/web/sites/templates/shell_user_edit.htm
+++ b/interface/web/sites/templates/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)"/>
+        <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/sites/templates/web_domain_stats.htm b/interface/web/sites/templates/web_domain_stats.htm
index 48258e2bf6da5349c19828b6c1c0cb193e6f13ee..200cda24bf2e1f3a7943454203bb5c3b5b14c54b 100644
--- a/interface/web/sites/templates/web_domain_stats.htm
+++ b/interface/web/sites/templates/web_domain_stats.htm
@@ -10,7 +10,7 @@
 	  </div>
 	  <div class="ctrlHolder">
       	<label for="stats_password">{tmpl_var name='stats_password_txt'}</label>
-        <input name="stats_password" id="stats_password" value="{tmpl_var name='stats_password'}" size="30" maxlength="255" type="password" class="textInput" />
+        <input name="stats_password" id="stats_password" value="{tmpl_var name='stats_password'}" size="30" maxlength="255" type="password" class="textInput" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('stats_password');">{tmpl_var name='generate_password_txt'}</a>
 	  </div>
 	  <div class="ctrlHolder">
       	<label for="stats_type">{tmpl_var name='stats_type_txt'}</label>
diff --git a/interface/web/sites/templates/web_folder_user_edit.htm b/interface/web/sites/templates/web_folder_user_edit.htm
index 9a50af276e792dabd4d6f51b5f5b9623eef6678c..f466e5252b8395881348ab0f497fda4b69b0b19d 100644
--- a/interface/web/sites/templates/web_folder_user_edit.htm
+++ b/interface/web/sites/templates/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" />
+        <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" />&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='active_txt'}</p>
diff --git a/interface/web/sites/templates/webdav_user_edit.htm b/interface/web/sites/templates/webdav_user_edit.htm
index 4b6b4edfda5d783c679aeab6c8bc3072f49637de..5bd7f82a8b13e00cd0825a7958134aa841142f6d 100644
--- a/interface/web/sites/templates/webdav_user_edit.htm
+++ b/interface/web/sites/templates/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)"/>
+				<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>