diff --git a/setup/lang/phpgw_de.lang b/setup/lang/phpgw_de.lang
index 003d3d7077..4aa4403445 100644
--- a/setup/lang/phpgw_de.lang
+++ b/setup/lang/phpgw_de.lang
@@ -10,7 +10,7 @@
this will create 1 admin account and 3 demo accounts
the username/passwords are: demo/guest, demo2/guest and demo3/guest. setup de Dies wird 1 Admin- und 3 Demo-Benutzerkonten anlegen.
Die Benutzernamen/Passwörter sind: demo/guest, demo2/guest und demo3/guest.
accounts existing setup de Benutzerkonten existieren
actions setup de Aktionen
-activate save password check setup de Aktiviere die "sichere Passwort" Überprüfung
+activate safe password check setup de Aktiviere die "sichere Passwort" Überprüfung
add auto-created users to this group ('default' will be attempted if this is empty.) setup de Automatisch erzeugte Benutzer zu dieser Grupper hinzufügen ("Default" wird versucht wenn nichts angegeben.)
add new database instance (egw domain) setup de Neue Datenbankinstanz (eGW Domain) hinzufügen
additional settings setup de Zusätzliche Einstellungen
diff --git a/setup/lang/phpgw_en.lang b/setup/lang/phpgw_en.lang
index ef1a474107..fa44e9e366 100644
--- a/setup/lang/phpgw_en.lang
+++ b/setup/lang/phpgw_en.lang
@@ -10,7 +10,7 @@
this will create 1 admin account and 3 demo accounts
the username/passwords are: demo/guest, demo2/guest and demo3/guest. setup en This will create 1 admin account and 3 demo accounts
The username/passwords are: demo/guest, demo2/guest and demo3/guest.
accounts existing setup en Accounts existing
actions setup en Actions
-activate save password check setup en Activate save password check
+activate safe password check setup en Activate safe password check
add auto-created users to this group ('default' will be attempted if this is empty.) setup en Add auto-created users to this group ('Default' will be attempted if this is empty.)
add new database instance (egw domain) setup en Add new database instance (eGW domain)
additional settings setup en Additional settings
diff --git a/setup/lang/phpgw_es-es.lang b/setup/lang/phpgw_es-es.lang
index 75f1599cda..0922e07735 100644
--- a/setup/lang/phpgw_es-es.lang
+++ b/setup/lang/phpgw_es-es.lang
@@ -10,7 +10,7 @@
this will create 1 admin account and 3 demo accounts
the username/passwords are: demo/guest, demo2/guest and demo3/guest. setup es-es Esto creará 1 cuenta de administrador y 3 de demostración
Los nombres de usuario y contraseńas son: demo/guest, demo2/guest y demo3/guest.
accounts existing setup es-es Existen cuentas
actions setup es-es Acciones
-activate save password check setup es-es Activar la comprobación para guardar contraseńas
+activate safe password check setup es-es Activar la comprobación para guardar contraseńas
add auto-created users to this group ('default' will be attempted if this is empty.) setup es-es Ańadir usuarios creados automáticamente a este grupo (si está vacío, se le asignará el grupo predeterminado)
add new database instance (egw domain) setup es-es Ańadir nueva instancia de base de datos (dominio eGW)
additional settings setup es-es Configuración adicional
diff --git a/setup/lang/phpgw_pt-br.lang b/setup/lang/phpgw_pt-br.lang
index 035e24cc8a..0f22465c94 100644
--- a/setup/lang/phpgw_pt-br.lang
+++ b/setup/lang/phpgw_pt-br.lang
@@ -10,7 +10,7 @@
this will create 1 admin account and 3 demo accounts
the username/passwords are: demo/guest, demo2/guest and demo3/guest. setup pt-br Isto irá criar 1 conta de administrador e 3 contas demo
Os usuários/senhas săo: demo/guest, demo2/guest and demo3/guest.
accounts existing setup pt-br Contas existentes
actions setup pt-br Açőes
-activate save password check setup pt-br Ativar salvamento de senhas
+activate safe password check setup pt-br Ativar salvamento de senhas
add auto-created users to this group ('default' will be attempted if this is empty.) setup pt-br Adicionar usuários criados automaticamente para este grupo (o grupo 'Padrăo' será utilizado se este campo estiver vazio.)
add new database instance (egw domain) setup pt-br Adicionar nova base de dados (domínio eGW )
additional settings setup pt-br Configuraçőes Adicionais
diff --git a/setup/lang/phpgw_sk.lang b/setup/lang/phpgw_sk.lang
index d04e8af46e..68c0654b48 100644
--- a/setup/lang/phpgw_sk.lang
+++ b/setup/lang/phpgw_sk.lang
@@ -10,7 +10,7 @@
this will create 1 admin account and 3 demo accounts
the username/passwords are: demo/guest, demo2/guest and demo3/guest. setup sk Týmto sa vytvorí 1 správcovský účet a 3 testovacie
Používateľské mená/heslá sú: demo/guest, demo2/guest, demo3/guest.
accounts existing setup sk Existujúce účty
actions setup sk Akcie
-activate save password check setup sk Aktivovať voľbu ukladania hesla
+activate safe password check setup sk Aktivovať voľbu ukladania hesla
add auto-created users to this group ('default' will be attempted if this is empty.) setup sk Automaticky vytvorených používateľov priradiť do tejto skupiny (ak prázdne, použije sa 'Predvolená').
add new database instance (egw domain) setup sk Pridať novú databázovú inštanciu (eGW domain)
additional settings setup sk Ďalšie nastavenia
diff --git a/setup/lang/phpgw_zh-tw.lang b/setup/lang/phpgw_zh-tw.lang
index d89660958e..ebd7431b2e 100644
--- a/setup/lang/phpgw_zh-tw.lang
+++ b/setup/lang/phpgw_zh-tw.lang
@@ -10,7 +10,7 @@
this will create 1 admin account and 3 demo accounts
the username/passwords are: demo/guest, demo2/guest and demo3/guest. setup zh-tw éćç˘ç 1 ĺ玥çč
帳č䝼ĺ 3 ĺ渏芌帳č
渏芌帳čçĺŻç˘źĺĺĽćŻďź demo/guest, demo2/guest č demo3/guestă
accounts existing setup zh-tw 帳č塲çśĺĺ¨
actions setup zh-tw ĺä˝
-activate save password check setup zh-tw ĺç¨ĺ˛ĺĺŻç˘źĺč˝
+activate safe password check setup zh-tw ĺç¨ĺ˛ĺĺŻç˘źĺč˝
add auto-created users to this group ('default' will be attempted if this is empty.) setup zh-tw ć°ĺ˘čŞĺĺťşçŤä˝żç¨č
ĺ°éĺ瞤çľďščĽç犺ç˝ĺ使ç¨ăDefaultăďš
add new database instance (egw domain) setup zh-tw ć°ĺ˘čłć庍富äž(eGW 眲ĺ)
additional settings setup zh-tw ĺ
śäťč¨ĺŽ
diff --git a/setup/templates/default/config.tpl b/setup/templates/default/config.tpl
index 430832abf8..da794355d1 100644
--- a/setup/templates/default/config.tpl
+++ b/setup/templates/default/config.tpl
@@ -213,7 +213,7 @@