diff --git a/admin/editapplication.php b/admin/editapplication.php
index 0eeda7d8ab..651e11758d 100644
--- a/admin/editapplication.php
+++ b/admin/editapplication.php
@@ -50,6 +50,9 @@
 
 		$totalerrors = 0;
 
+		$n_app_name = chop($n_app_name);
+		$n_app_title = chop($n_app_title);
+
 		if (! $n_app_name)
 		{
 			$error[$totalerrors++] = lang('You must enter an application name.');
diff --git a/admin/newapplication.php b/admin/newapplication.php
index 2ac46399d2..a0f9db2e61 100644
--- a/admin/newapplication.php
+++ b/admin/newapplication.php
@@ -44,6 +44,9 @@
 			$app_order = 0;
 		}
 
+		$n_app_name = chop($n_app_name);
+		$n_app_title = chop($n_app_title);
+
 		$phpgw->db->query("select count(*) from phpgw_applications where app_name='"
 			. addslashes($n_app_name) . "'",__LINE__,__FILE__);
 		$phpgw->db->next_record();