diff --git a/interface/lib/classes/aps_guicontroller.inc.php b/interface/lib/classes/aps_guicontroller.inc.php
index c895e40d0ba1479588506c05cf91980cc819fde9..8a764a9c5c776618156be1023cdb5ca2a9f4f590 100644
--- a/interface/lib/classes/aps_guicontroller.inc.php
+++ b/interface/lib/classes/aps_guicontroller.inc.php
@@ -567,6 +567,16 @@ class ApsGUIController extends ApsBase
 		}
 		else $error[] = $app->lng('error_main_domain');
 
+		if(isset($postinput['admin_password']))
+		{
+			$app->uses('validate_password');
+
+			$passwordError = $app->validate_password->password_check('', $postinput['admin_password'], '');
+			if ($passwordError) {
+				$error[] = $passwordError;
+			}
+		}
+
 		// Main location (not obligatory but must be supplied)
 		if(isset($postinput['main_location']))
 		{
diff --git a/interface/web/sites/lib/lang/ar_aps.lng b/interface/web/sites/lib/lang/ar_aps.lng
index 29fb7b6a40de911e18acadb73479b1da703cbfe9..881c146a4dd1a58e7bd50cfc34f7ea21e0073bb4 100644
--- a/interface/web/sites/lib/lang/ar_aps.lng
+++ b/interface/web/sites/lib/lang/ar_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
 $wb['btn_install_txt'] = 'Install';
 $wb['btn_cancel_txt'] = 'Cancel';
 $wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/bg_aps.lng b/interface/web/sites/lib/lang/bg_aps.lng
index 29fb7b6a40de911e18acadb73479b1da703cbfe9..5313f2d910ed4363508efab30a3cd3dd9b801d72 100644
--- a/interface/web/sites/lib/lang/bg_aps.lng
+++ b/interface/web/sites/lib/lang/bg_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
 $wb['btn_install_txt'] = 'Install';
 $wb['btn_cancel_txt'] = 'Cancel';
 $wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
-?>
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['password_strength_txt'] = 'Сила на паролата';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/br_aps.lng b/interface/web/sites/lib/lang/br_aps.lng
index 6c5be1da543b191955939f1887120259c5f2649f..46cfabfb0146dcfb8104d65c8e2c24b74f45d591 100644
--- a/interface/web/sites/lib/lang/br_aps.lng
+++ b/interface/web/sites/lib/lang/br_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'Atualização da lista de pacotes fina
 $wb['btn_install_txt'] = 'Instalar';
 $wb['btn_cancel_txt'] = 'Cancelar';
 $wb['limit_aps_txt'] = 'O limite de instâncias de apps para esta conta foi alcançado.';
-?>
+$wb['generate_password_txt'] = 'Gerar senha';
+$wb['repeat_password_txt'] = 'Repetir senha';
+$wb['password_mismatch_txt'] = 'A senhas não coincidem.';
+$wb['password_match_txt'] = 'A senhas coincidem.';
+$wb['password_strength_txt'] = 'Dificuldade da senha';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ca_aps.lng b/interface/web/sites/lib/lang/ca_aps.lng
index 2c90556d661c4bf943ac505a9f6d75aaba2a4910..bbf799bb39d310822b2002e3a8383d9e799fb903 100644
--- a/interface/web/sites/lib/lang/ca_aps.lng
+++ b/interface/web/sites/lib/lang/ca_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'Mise à jour APS Packagelist terminée
 $wb['btn_install_txt'] = 'Installer';
 $wb['btn_cancel_txt'] = 'Annuler';
 $wb['limit_aps_txt'] = 'Le nombre max d\'instances APS pour votre compte a été atteint.';
-?>
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['password_strength_txt'] = 'Force du mot de passe';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/cz_aps.lng b/interface/web/sites/lib/lang/cz_aps.lng
index 5ec94945d13fe951dcc94719144eb18e7b71d0fd..36bc6816f419dbfa3dfe61d2bc6d876c897b5737 100644
--- a/interface/web/sites/lib/lang/cz_aps.lng
+++ b/interface/web/sites/lib/lang/cz_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'APS aktualizace seznamu balíčků byl
 $wb['btn_install_txt'] = 'Instalovat';
 $wb['btn_cancel_txt'] = 'Zrušit';
 $wb['limit_aps_txt'] = 'Max. počet APS  instancí u vašeho účtu je dosaženo.';
-?>
+$wb['generate_password_txt'] = 'Generovat heslo';
+$wb['repeat_password_txt'] = 'Opakujte heslo';
+$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
+$wb['password_match_txt'] = 'Hesla se shodují.';
+$wb['password_strength_txt'] = 'Bezpečnost hesla';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/de_aps.lng b/interface/web/sites/lib/lang/de_aps.lng
index aab6f4edf7453af1f9f2d93ff5c62aed1eefb444..bb986b5c44c952bdc5546181f9f57f0e06ca6123 100644
--- a/interface/web/sites/lib/lang/de_aps.lng
+++ b/interface/web/sites/lib/lang/de_aps.lng
@@ -55,4 +55,9 @@ $wb['installation_success_txt'] = 'Installiert';
 $wb['installation_remove_txt'] = 'Deinstallation vorgemerkt';
 $wb['packagelist_update_finished_txt'] = 'APS Paketlistenupdate beendet.';
 $wb['limit_aps_txt'] = 'Die maximale Anzahl an APS-Instanzen für Ihr Konto wurde erreicht.';
-?>
+$wb['generate_password_txt'] = 'Passwort erzeugen';
+$wb['repeat_password_txt'] = 'Passwort wiederholen';
+$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
+$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
+$wb['password_strength_txt'] = 'Passwortkomplexität';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/dk_aps.lng b/interface/web/sites/lib/lang/dk_aps.lng
index 83508753545e8e6d4ecee89b3a96799cd69eab86..ca006e2eb27fab5e3e87724050a35b190e36b839 100644
--- a/interface/web/sites/lib/lang/dk_aps.lng
+++ b/interface/web/sites/lib/lang/dk_aps.lng
@@ -55,4 +55,9 @@ $wb['installation_success_txt'] = 'Installeret';
 $wb['installation_remove_txt'] = 'Fjernelse planlagt';
 $wb['packagelist_update_finished_txt'] = 'APS Pakke Liste opdatering er færdig.';
 $wb['limit_aps_txt'] = 'Max. antal af APS forekomster for din konto er nået.';
+$wb['generate_password_txt'] = 'Generer Adgangskode';
+$wb['repeat_password_txt'] = 'Gentage Adgangskode';
+$wb['password_mismatch_txt'] = 'Adgangskoderne stemmer ikke overens.';
+$wb['password_match_txt'] = 'Adgangskoderne stemmer overens.';
+$wb['password_strength_txt'] = 'Adgangskode styrke';
 ?>
diff --git a/interface/web/sites/lib/lang/el_aps.lng b/interface/web/sites/lib/lang/el_aps.lng
index 29fb7b6a40de911e18acadb73479b1da703cbfe9..0209737f61976aba4dedf491b315a8cec9d48d66 100644
--- a/interface/web/sites/lib/lang/el_aps.lng
+++ b/interface/web/sites/lib/lang/el_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
 $wb['btn_install_txt'] = 'Install';
 $wb['btn_cancel_txt'] = 'Cancel';
 $wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['password_strength_txt'] = 'Δύναμη συνθηματικού';
 ?>
diff --git a/interface/web/sites/lib/lang/en_aps.lng b/interface/web/sites/lib/lang/en_aps.lng
index bd33c1884ae848cf3b466433810528053a34e323..b0300fe0cc36d79df16043e7c0b03a63ef3b5b4b 100644
--- a/interface/web/sites/lib/lang/en_aps.lng
+++ b/interface/web/sites/lib/lang/en_aps.lng
@@ -55,4 +55,9 @@ $wb['installation_success_txt'] = 'Installed';
 $wb['installation_remove_txt'] = 'Removal planned';
 $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
 $wb["limit_aps_txt"] = 'The max. number of APS instances for your account is reached.';
+$wb["generate_password_txt"] = 'Generate Password';
+$wb["repeat_password_txt"] = 'Repeat Password';
+$wb["password_mismatch_txt"] = 'The passwords do not match.';
+$wb["password_match_txt"] = 'The passwords do match.';
+$wb["password_strength_txt"] = "Password strength";
 ?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/es_aps.lng b/interface/web/sites/lib/lang/es_aps.lng
index 746631008063f4d0eb07d75fb9ced5fe035aea30..3780b32edd64f99d83f62f6f92f104fc8035c478 100755
--- a/interface/web/sites/lib/lang/es_aps.lng
+++ b/interface/web/sites/lib/lang/es_aps.lng
@@ -55,4 +55,9 @@ $wb['supported_languages_txt'] = 'Idiomas soportados';
 $wb['supported_php_versions_txt'] = 'Versiones de PHP soportadas';
 $wb['version_txt'] = 'Versión';
 $wb['yes_txt'] = 'Sí';
+$wb['generate_password_txt'] = 'Generar contraseña';
+$wb['repeat_password_txt'] = 'Repetir contraseña';
+$wb['password_mismatch_txt'] = 'Las contraseñas no coinciden.';
+$wb['password_match_txt'] = 'Las contraseñas coinciden.';
+$wb['password_strength_txt'] = 'Fortaleza de la contraseña';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_aps.lng b/interface/web/sites/lib/lang/fi_aps.lng
index 29fb7b6a40de911e18acadb73479b1da703cbfe9..d78701f272b16de81f457eb23b4b4998c41fde24 100644
--- a/interface/web/sites/lib/lang/fi_aps.lng
+++ b/interface/web/sites/lib/lang/fi_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
 $wb['btn_install_txt'] = 'Install';
 $wb['btn_cancel_txt'] = 'Cancel';
 $wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['password_strength_txt'] = 'Salasanan vahvuus';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_aps.lng b/interface/web/sites/lib/lang/fr_aps.lng
index 10b6edbcfd77503df78033503b55515000b04e85..6beef9939f77b03faaf2ebfbc46386fd4f0b97e4 100644
--- a/interface/web/sites/lib/lang/fr_aps.lng
+++ b/interface/web/sites/lib/lang/fr_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'Mise à jour APS Packagelist terminée
 $wb['btn_install_txt'] = 'Installer';
 $wb['btn_cancel_txt'] = 'Annuler';
 $wb['limit_aps_txt'] = 'Le nombre max d’instances APS pour votre compte a été atteint.';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['password_strength_txt'] = 'Force du mot de passe';
 ?>
diff --git a/interface/web/sites/lib/lang/hr_aps.lng b/interface/web/sites/lib/lang/hr_aps.lng
index 8b2fa6450ebb6f79a414051a66d30397beb333fd..79d31cf7faab2004aac4e83518100cfe44fa4731 100644
--- a/interface/web/sites/lib/lang/hr_aps.lng
+++ b/interface/web/sites/lib/lang/hr_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'Nadogradnja APS liste paketa je završ
 $wb['btn_install_txt'] = 'Instaliraj';
 $wb['btn_cancel_txt'] = 'Odustani';
 $wb['limit_aps_txt'] = 'Iskoristili ste maksimalan broj APS instanci za vaš račun.';
+$wb['generate_password_txt'] = 'Generiraj Å¡ifru';
+$wb['repeat_password_txt'] = 'Ponovi Å¡ifru';
+$wb['password_mismatch_txt'] = 'Šifre nisu identične.';
+$wb['password_match_txt'] = 'Šifre su identične.';
+$wb['password_strength_txt'] = 'Jačina šifre';
 ?>
diff --git a/interface/web/sites/lib/lang/hu_aps.lng b/interface/web/sites/lib/lang/hu_aps.lng
index 29fb7b6a40de911e18acadb73479b1da703cbfe9..88708732df9a8ab2346f1b791da96aca0c8cc555 100644
--- a/interface/web/sites/lib/lang/hu_aps.lng
+++ b/interface/web/sites/lib/lang/hu_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
 $wb['btn_install_txt'] = 'Install';
 $wb['btn_cancel_txt'] = 'Cancel';
 $wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['password_strength_txt'] = 'Jelszó erőssége';
 ?>
diff --git a/interface/web/sites/lib/lang/id_aps.lng b/interface/web/sites/lib/lang/id_aps.lng
index 29fb7b6a40de911e18acadb73479b1da703cbfe9..b8c9af215248136d4a3f424c5c1cbadfa2f4d432 100644
--- a/interface/web/sites/lib/lang/id_aps.lng
+++ b/interface/web/sites/lib/lang/id_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
 $wb['btn_install_txt'] = 'Install';
 $wb['btn_cancel_txt'] = 'Cancel';
 $wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['password_strength_txt'] = 'Kekuatan Sandi';
 ?>
diff --git a/interface/web/sites/lib/lang/it_aps.lng b/interface/web/sites/lib/lang/it_aps.lng
index ced17becd36d7a36cddfb624c23f603fbcc951a2..0a6365f98f2b1eee54e80e88d6b59223347ca661 100644
--- a/interface/web/sites/lib/lang/it_aps.lng
+++ b/interface/web/sites/lib/lang/it_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'Elenco aggiornamenti APS terminato.';
 $wb['btn_install_txt'] = 'Installa';
 $wb['btn_cancel_txt'] = 'Annulla';
 $wb['limit_aps_txt'] = 'Nmero massimo di istanza APS raggiunto per il tuo account.';
+$wb['generate_password_txt'] = 'Genera Password';
+$wb['repeat_password_txt'] = 'Ripeti Password';
+$wb['password_mismatch_txt'] = 'Le password non coincidono.';
+$wb['password_match_txt'] = 'Le password coincidono.';
+$wb['password_strength_txt'] = 'Livello sicurezza Password';
 ?>
diff --git a/interface/web/sites/lib/lang/ja_aps.lng b/interface/web/sites/lib/lang/ja_aps.lng
index 29fb7b6a40de911e18acadb73479b1da703cbfe9..dc6b22edf7c207a0fd0e7b637b4fc427953bb84e 100644
--- a/interface/web/sites/lib/lang/ja_aps.lng
+++ b/interface/web/sites/lib/lang/ja_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
 $wb['btn_install_txt'] = 'Install';
 $wb['btn_cancel_txt'] = 'Cancel';
 $wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['password_strength_txt'] = 'パスワードの強度';
 ?>
diff --git a/interface/web/sites/lib/lang/nl_aps.lng b/interface/web/sites/lib/lang/nl_aps.lng
index 9d51f7457b39842d0b73e2eb3c11a1354bcf370c..c0adacee99da83dd125a33b1a4bf347fd2cd81be 100644
--- a/interface/web/sites/lib/lang/nl_aps.lng
+++ b/interface/web/sites/lib/lang/nl_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
 $wb['btn_install_txt'] = 'Installeren';
 $wb['btn_cancel_txt'] = 'Annuleren';
 $wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['password_strength_txt'] = 'Wachtwoord sterkte';
 ?>
diff --git a/interface/web/sites/lib/lang/pl_aps.lng b/interface/web/sites/lib/lang/pl_aps.lng
index 1a2ffad688a4b1f36d0216a7e38326a7b0b0c35f..c17bbca53217981bc1f7c29dec6d230b12ef7744 100644
--- a/interface/web/sites/lib/lang/pl_aps.lng
+++ b/interface/web/sites/lib/lang/pl_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'Aktualizacja listy pakietów APS zako
 $wb['btn_install_txt'] = 'Instaluj';
 $wb['btn_cancel_txt'] = 'Anuluj';
 $wb['limit_aps_txt'] = 'Maksymalna liczba instancji APS dla Twojego konta została wyczerpana.';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
+$wb['password_match_txt'] = 'Hasła pasują';
+$wb['password_strength_txt'] = 'Siła hasła';
 ?>
diff --git a/interface/web/sites/lib/lang/pt_aps.lng b/interface/web/sites/lib/lang/pt_aps.lng
index 29fb7b6a40de911e18acadb73479b1da703cbfe9..c17ef0091483a3368e159288993791cbc02874ed 100644
--- a/interface/web/sites/lib/lang/pt_aps.lng
+++ b/interface/web/sites/lib/lang/pt_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
 $wb['btn_install_txt'] = 'Install';
 $wb['btn_cancel_txt'] = 'Cancel';
 $wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['password_strength_txt'] = 'Dificuldade da senha';
 ?>
diff --git a/interface/web/sites/lib/lang/ro_aps.lng b/interface/web/sites/lib/lang/ro_aps.lng
index 29fb7b6a40de911e18acadb73479b1da703cbfe9..881c146a4dd1a58e7bd50cfc34f7ea21e0073bb4 100644
--- a/interface/web/sites/lib/lang/ro_aps.lng
+++ b/interface/web/sites/lib/lang/ro_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
 $wb['btn_install_txt'] = 'Install';
 $wb['btn_cancel_txt'] = 'Cancel';
 $wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_aps.lng b/interface/web/sites/lib/lang/ru_aps.lng
index f403143e5952f9cd716c6ee66c9a03491d9900c6..3dd4ad0a8ad3658cd221e5f2c0f6b283530eab59 100644
--- a/interface/web/sites/lib/lang/ru_aps.lng
+++ b/interface/web/sites/lib/lang/ru_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'Обновление списка па
 $wb['btn_install_txt'] = 'Установка';
 $wb['btn_cancel_txt'] = 'Отменить';
 $wb['limit_aps_txt'] = 'Макс. количество экземпляров APS достигнуто.';
+$wb['generate_password_txt'] = 'Создать пароль';
+$wb['repeat_password_txt'] = 'Повторить пароль';
+$wb['password_mismatch_txt'] = 'Пароли не совпадают.';
+$wb['password_match_txt'] = 'Эти пароли совпадают.';
+$wb['password_strength_txt'] = 'Стойкость пароля';
 ?>
diff --git a/interface/web/sites/lib/lang/se_aps.lng b/interface/web/sites/lib/lang/se_aps.lng
index 1a21cd0fd26fab7820b314756c32acabd8075161..3b32095d623f4fb0cde80a1ddc437ae11bda5e7b 100644
--- a/interface/web/sites/lib/lang/se_aps.lng
+++ b/interface/web/sites/lib/lang/se_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
 $wb['btn_install_txt'] = 'Installera';
 $wb['btn_cancel_txt'] = 'Avbryt';
 $wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/sk_aps.lng b/interface/web/sites/lib/lang/sk_aps.lng
index 29fb7b6a40de911e18acadb73479b1da703cbfe9..d6e6c7f4ca735a6ca76ee12d970ffaebbb16f8ab 100644
--- a/interface/web/sites/lib/lang/sk_aps.lng
+++ b/interface/web/sites/lib/lang/sk_aps.lng
@@ -55,4 +55,9 @@ $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
 $wb['btn_install_txt'] = 'Install';
 $wb['btn_cancel_txt'] = 'Cancel';
 $wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['password_strength_txt'] = 'Pevnosť hesla';
 ?>
diff --git a/interface/web/sites/lib/lang/tr_aps.lng b/interface/web/sites/lib/lang/tr_aps.lng
index 534ee020a7642a63eea394f36c60c4dd63783f0d..1c6ccd49a6d09c41f0b65434bc1ec2699ce047e8 100644
--- a/interface/web/sites/lib/lang/tr_aps.lng
+++ b/interface/web/sites/lib/lang/tr_aps.lng
@@ -55,4 +55,9 @@ $wb['installation_success_txt'] = 'Yüklendi';
 $wb['installation_remove_txt'] = 'Kaldırma planlandı';
 $wb['packagelist_update_finished_txt'] = 'APS paket listesi güncellendi.';
 $wb['limit_aps_txt'] = 'Hesabınıza ekleyebileceğiniz en fazla APS kopyası sayısına ulaştınız.';
+$wb['generate_password_txt'] = 'Parola OluÅŸtur';
+$wb['repeat_password_txt'] = 'Parola Onayı';
+$wb['password_mismatch_txt'] = 'Parola ile onayı aynı değil.';
+$wb['password_match_txt'] = 'Parola ile onayı aynı.';
+$wb['password_strength_txt'] = 'Parola Güçlüğü';
 ?>
diff --git a/interface/web/sites/templates/aps_install_package.htm b/interface/web/sites/templates/aps_install_package.htm
index d04d671534b4f2f3f6964544c25710be1208df93..2c4b48b9d38d2a243baa8e1b39367a699f5e8b13 100644
--- a/interface/web/sites/templates/aps_install_package.htm
+++ b/interface/web/sites/templates/aps_install_package.htm
@@ -1,58 +1,125 @@
 <h1>
-    {tmpl_var name='installation_txt'}: {tmpl_var name='pkg_name'} {tmpl_var name='pkg_version'}-{tmpl_var name='pkg_release'}
-    <span style="float:right">
-        <tmpl_if name='pkg_icon' op='!=' value=''>
-            <img src="{tmpl_var name='pkg_icon'}" height="32" width="32" alt="{tmpl_var name='pkg_name'}" style="vertical-align:text-bottom;" /> 
-        </tmpl_if>
-    </span>
+	{tmpl_var name='installation_txt'}: {tmpl_var name='pkg_name'} {tmpl_var name='pkg_version'}-{tmpl_var name='pkg_release'}
+	<span style="float:right">
+		<tmpl_if name='pkg_icon' op='!=' value=''>
+			<img src="{tmpl_var name='pkg_icon'}" height="32" width="32" alt="{tmpl_var name='pkg_name'}" style="vertical-align:text-bottom;" />
+		</tmpl_if>
+	</span>
 </h1>
-    
+
 <tmpl_if name='error'>
-    <div id="errorMsg"><h3>ERROR</h3><ol>{tmpl_var name='error'}</ol></div>
+	<div id="errorMsg"><h3>ERROR</h3><ol>{tmpl_var name='error'}</ol></div>
 </tmpl_if>
 
 
-        
-            <legend>{tmpl_var name='basic_settings_txt'}</legend>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">{tmpl_var name='install_location_txt'}</label>
-                <div class="col-sm-9">
-				    <div class='input-group'>
+
+			<legend>{tmpl_var name='basic_settings_txt'}</legend>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">{tmpl_var name='install_location_txt'}</label>
+				<div class="col-sm-9">
+					<div class='input-group'>
 						<span class='input-group-addon'>http(s)://</span>
 						<div class='input-group-field'>
 							DOMAIN_LIST_SPACE
 						</div>
 						<span class='input-group-addon'>/</span>
 						<input type="text" id="main_location" name="main_location" value="{tmpl_var name='inp_main_location'}" class="form-control" />
-                    </div>
+					</div>
 				</div>
-            </div>
+			</div>
 			<tmpl_if name='pkg_requirements_database' op='!=' value=''>
-                <div class="form-group">
-                    <label for="main_database_password" class="col-sm-3 control-label">{tmpl_var name='new_database_password_txt'}</label>
-                    <div class="col-sm-9"><input type="text" class="form-control" name="main_database_password" id="main_database_password" value="{tmpl_var name='inp_main_database_password'}" /></div></div>
-            </tmpl_if>
-                
-            PKG_SETTINGS_SPACE
-                
-            <legend>{tmpl_var name='license_txt'}</legend>
-            <div class="form-group">
-                <label for="license" class="col-sm-3 control-label">{tmpl_var name='license_txt'}</label>
-                <tmpl_if name='pkg_license_content' op='==' value=''>{tmpl_var name='pkg_license_name'}<br /></tmpl_if>
-                <tmpl_if name='pkg_license_type' op='==' value='url'>
-                    <a href="{tmpl_var name='pkg_license_content'}" target="_blank">{tmpl_var name='pkg_license_content'}</a>
-                    <tmpl_elseif name='pkg_license_content'>
-                        <div class="col-sm-9"><textarea class="form-control" rows="10" cols="80" id="license_text">{tmpl_var name='pkg_license_content'}</textarea></div>
-                </tmpl_if>
-            </div>
-            <div class="form-group">
-                <label for="license" class="col-sm-3 control-label">{tmpl_var name='acceptance_txt'}</label>
-                <div class="col-sm-6"><input type="checkbox" name="license" id="license" <tmpl_if name='inp_license' op='==' value='true'>checked</tmpl_if>/> &nbsp;&nbsp;{tmpl_var name='acceptance_text'}
-            </div>
-        
-            
-        <input type="hidden" name="install" value="0" />
-        <div class="clear"><div class="right">
-            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_install_txt'}" name="btn_install" onclick="document.pageForm.install.value=1; ISPConfig.submitForm('pageForm','sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');">{tmpl_var name='btn_install_txt'}</button>
-            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/aps_availablepackages_list.php">{tmpl_var name='btn_cancel_txt'}</button>
-        </div></div>
+				<div class="form-group">
+					<label for="main_database_password" class="col-sm-3 control-label">{tmpl_var name='new_database_password_txt'}</label>
+					<div class="col-sm-9"><input type="text" class="form-control" name="main_database_password" id="main_database_password" value="{tmpl_var name='inp_main_database_password'}" /></div>
+				</div>
+			</tmpl_if>
+
+			PKG_SETTINGS_SPACE
+
+			<legend>{tmpl_var name='license_txt'}</legend>
+			<div class="form-group">
+				<label for="license" class="col-sm-3 control-label">{tmpl_var name='license_txt'}</label>
+				<tmpl_if name='pkg_license_content' op='==' value=''>{tmpl_var name='pkg_license_name'}<br /></tmpl_if>
+				<tmpl_if name='pkg_license_type' op='==' value='url'>
+					<a href="{tmpl_var name='pkg_license_content'}" target="_blank">{tmpl_var name='pkg_license_content'}</a>
+					<tmpl_elseif name='pkg_license_content'>
+						<div class="col-sm-9"><textarea class="form-control" rows="10" cols="80" id="license_text">{tmpl_var name='pkg_license_content'}</textarea></div>
+				</tmpl_if>
+			</div>
+			<div class="form-group">
+				<label for="license" class="col-sm-3 control-label">{tmpl_var name='acceptance_txt'}</label>
+				<div class="col-sm-6">
+					<input type="checkbox" name="license" id="license" <tmpl_if name='inp_license' op='==' value='true'>checked</tmpl_if>/> &nbsp;&nbsp;{tmpl_var name='acceptance_text'}
+				</div>
+			</div>
+
+
+		<input type="hidden" name="install" value="0" />
+		<div class="clear">
+			<div class="right">
+				<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_install_txt'}" name="btn_install" onclick="document.pageForm.install.value=1; ISPConfig.submitForm('pageForm','sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');">{tmpl_var name='btn_install_txt'}</button>
+				<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/aps_availablepackages_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+			</div>
+		</div>
+
+		<div class="hidden" id="passwordFieldWithChecks">
+			<div class="form-group">
+				<label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
+				<div class="col-sm-9">
+					<div class="input-group">
+						<input type="password" name="password" id="password" value="{tmpl_var name='password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />
+						<span class="input-group-btn">
+							<button class="btn btn-default" type="button" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</button>
+						</span>
+						<p class="formHint"></p>
+					</div>
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
+				<div class="col-sm-9 checkbox">
+					<div id="passBar"></div>
+					<span id="passText">&nbsp;</span>
+				</div>
+			</div>
+			<div class="form-group">
+				<label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
+				<div class="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" class="form-control" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" /></div></div>
+			<div class="form-group">
+				<div class="col-sm-offset-3 col-sm-9">
+					<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+					<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+				</div>
+			</div>
+		</div>
+
+		<script type="text/javascript">
+			jQuery(document).ready(function () {
+				let passwordField = jQuery('[type=password]').first();
+				if (!passwordField) {
+					return;
+				}
+
+				let passwordFieldFormGroup = passwordField.closest('.form-group');
+				let passwordFieldWithChecks = jQuery('#passwordFieldWithChecks');
+		
+				let originalLabel = passwordFieldFormGroup.find('label').first().text();
+				let originalName = passwordField.prop('name');
+				let originalMaxLength = passwordField.prop('maxlength');
+				let originalValue = passwordField.prop('value');
+				let originalFormHint = passwordField.next('.formHint').text();
+
+				let passwordFieldWithChecksInputField = passwordFieldWithChecks.find('[type=password]').first();
+				passwordFieldWithChecksInputField.prop('name', originalName);
+				passwordFieldWithChecksInputField.prop('value', originalValue);
+				passwordFieldWithChecksInputField.prop('name', originalName);
+				passwordFieldWithChecks.find('label').first().text(originalLabel);
+				passwordFieldWithChecks.find('.formHint').text(originalFormHint);
+		
+				if (originalMaxLength && originalMaxLength > 0) {
+					passwordFieldWithChecksInputField.prop('maxlength', originalMaxLength);
+				}
+
+				passwordFieldFormGroup.replaceWith(passwordFieldWithChecks.children());
+			});
+		</script>