diff --git a/setup/lang/phpgw_de.lang b/setup/lang/phpgw_de.lang
index f4fb2fba0e..16a90c4949 100644
--- a/setup/lang/phpgw_de.lang
+++ b/setup/lang/phpgw_de.lang
@@ -101,7 +101,7 @@ db type	setup	de	Datenbank Type
 db user	setup	de	Datenbank Benutzer
 default file system space per user/group ?	setup	de	Vorgabewert Festplatenplatz pro Benutzer / Gruppe ?
 delete	setup	de	Löschen
-delete all existing sql accounts, groups, acls and preferences (normaly not necessary)?	setup	de	Alle existierende SQL Benutzer, Gruppen, ACLs und Einstellungen löschen (normal nicht nötig)?
+delete all existing sql accounts, groups, acls and preferences (normally not necessary)?	setup	de	Alle existierende SQL Benutzer, Gruppen, ACLs und Einstellungen löschen (normal nicht nötig)?
 delete all my tables and data	setup	de	Alle meine Tabellen und Daten löschen
 delete all old languages and install new ones	setup	de	Alle installierten Sprachen löschen und neu installieren
 deleting tables	setup	de	Lösche Tabellen
diff --git a/setup/lang/phpgw_en.lang b/setup/lang/phpgw_en.lang
index 1d9e2bc14a..680f597e50 100644
--- a/setup/lang/phpgw_en.lang
+++ b/setup/lang/phpgw_en.lang
@@ -99,7 +99,7 @@ db type	setup	en	DB Type
 db user	setup	en	DB User
 default file system space per user/group ?	setup	en	Default file system space per user/group ?
 delete	setup	en	Delete
-delete all existing sql accounts, groups, acls and preferences (normaly not necessary)?	setup	en	Delete all existing SQL accounts, groups, ACLs and preferences (normaly not necessary)?
+delete all existing sql accounts, groups, acls and preferences (normally not necessary)?	setup	en	Delete all existing SQL accounts, groups, ACLs and preferences (normally not necessary)?
 delete all my tables and data	setup	en	Delete all my tables and data
 delete all old languages and install new ones	setup	en	Delete all old languages and install new ones
 deleting tables	setup	en	Deleting Tables
diff --git a/setup/lang/phpgw_es-es.lang b/setup/lang/phpgw_es-es.lang
index f551ac3afa..12671e4c8e 100644
--- a/setup/lang/phpgw_es-es.lang
+++ b/setup/lang/phpgw_es-es.lang
@@ -98,7 +98,7 @@ db type	setup	es-es	Tipo de base de datos
 db user	setup	es-es	Usuario de la base de datos
 default file system space per user/group ?	setup	es-es	¿Espacio predeterminado en el sistema por usuario o grupo?
 delete	setup	es-es	Borrar
-delete all existing sql accounts, groups, acls and preferences (normaly not necessary)?	setup	es-es	¿Borrar todas las cuentas SQL existentes, ACLs y preferencias? (normalmente no es necesario)
+delete all existing sql accounts, groups, acls and preferences (normally not necessary)?	setup	es-es	¿Borrar todas las cuentas SQL existentes, ACLs y preferencias? (normalmente no es necesario)
 delete all my tables and data	setup	es-es	Elimine todas mis tablas e información
 delete all old languages and install new ones	setup	es-es	Elimine todos los idiomas antigüos e instale los nuevos
 deleting tables	setup	es-es	Eliminando Tablas
diff --git a/setup/setup_demo.php b/setup/setup_demo.php
index 3abe421402..7365f08234 100644
--- a/setup/setup_demo.php
+++ b/setup/setup_demo.php
@@ -48,7 +48,7 @@
 
 		$setup_tpl->set_var('action_url','setup_demo.php');
 		$setup_tpl->set_var('description',lang('<b>This will create 1 admin account and 3 demo accounts</b><br>The username/passwords are: demo/guest, demo2/guest and demo3/guest.'));
-		$setup_tpl->set_var('lang_deleteall',lang('Delete all existing SQL accounts, groups, ACLs and preferences (normaly not necessary)?'));
+		$setup_tpl->set_var('lang_deleteall',lang('Delete all existing SQL accounts, groups, ACLs and preferences (normally not necessary)?'));
 
 		$setup_tpl->set_var('detailadmin',lang('Details for Admin account'));
 		$setup_tpl->set_var('adminusername',lang('Admin username'));
@@ -87,7 +87,7 @@
 		/* Begin transaction for acl, etc */
 		$GLOBALS['phpgw_setup']->db->transaction_begin();
 
-		if ($_POST['delete_all'])
+		if($_POST['delete_all'])
 		{
 			/* Now, clear out existing tables */
 			$GLOBALS['phpgw_setup']->db->query('DELETE FROM phpgw_accounts');