diff --git a/admin/newaccount.php b/admin/newaccount.php
index 4b8a862791..2c2e30db21 100755
--- a/admin/newaccount.php
+++ b/admin/newaccount.php
@@ -34,8 +34,9 @@
 		}
 	}
 
-  if ($submit) {
-     $totalerrors = 0;
+	if ($submit)
+	{
+		$totalerrors = 0;
 
 		if ($phpgw_info['server']['account_repository'] == 'ldap' && ! $allow_long_loginids)
 		{
@@ -44,7 +45,7 @@
 				$error[$totalerrors++] = lang('The loginid can not be more then 8 characters');
 			}
 		}
-  
+
 		if (! $account_lid)
 		{
 			$error[$totalerrors++] = lang('You must enter a loginid');
@@ -112,7 +113,7 @@
 				'account_expires'   => $account_expires
 			);
 			$phpgw->accounts->create($account_info);
-       
+
 			$account_id = $phpgw->accounts->name2id($account_lid);
 
 			$apps = CreateObject('phpgwapi.applications',array($account_id,'u'));
@@ -137,12 +138,13 @@
 					}
 				}
 			}
-        
+
 			$apps->account_type = 'u';
 			$apps->account_id = $account_id;
 			$apps->account_apps = Array(Array());
 
-			if ($account_permissions) {
+			if ($account_permissions)
+			{
 				@reset($account_permissions);
 				while ($app = each($account_permissions))
 				{
@@ -162,14 +164,16 @@
 			$phpgw->db->query("insert into phpgw_acl values ('preferences','changepassword','$account_id','1')",__LINE__,__FILE__);
 
 			// Assign user to groups
-			if ($account_groups) {
+			if ($account_groups)
+			{
 				for ($i=0;$i<count($account_groups);$i++)
 				{
 					$phpgw->acl->add_repository('phpgw_group',$account_groups[$i],$account_id,1);
 				}
 			}
 
-			if ($apps_after) {
+			if ($apps_after)
+			{
 				$pref = CreateObject('phpgwapi.preferences',$account_id);
 				$phpgw->common->hook_single('add_def_pref','admin');
 				while ($apps = each($apps_after))
@@ -188,15 +192,15 @@
 			$phpgw->db->unlock();
 
 /*
-       // start inlcuding other admin tools
-       while($app = each($apps_after))
-       {
-         $phpgw->common->hook_single('add_user_data', $value);
-       }       
+			// start inlcuding other admin tools
+			while($app = each($apps_after))
+			{
+				$phpgw->common->hook_single('add_user_data', $value);
+			}
 */
-        Header('Location: ' . $phpgw->link('/admin/accounts.php','cd='.$cd));
-        $phpgw->common->phpgw_exit();
-     }
+			Header('Location: ' . $phpgw->link('/admin/accounts.php','cd='.$cd));
+			$phpgw->common->phpgw_exit();
+		}
 	}
 	else
 	{
@@ -234,7 +238,7 @@
 	$phpgw->template->set_var('th_bg',$phpgw_info['theme']['th_bg']);
 	$phpgw->template->set_var('tr_color1',$phpgw_info['theme']['row_on']);
 	$phpgw->template->set_var('tr_color2',$phpgw_info['theme']['row_off']);
-  
+
 	$phpgw->template->set_var('form_action',$phpgw->link('/admin/newaccount.php'));
 	$phpgw->template->set_var('lang_loginid',lang('LoginID'));
 
@@ -284,7 +288,7 @@
 	// groups list
 	$groups_select = '<select name="account_groups[]" multiple>';
 
-	$groups =  $phpgw->accounts->get_list('groups');
+	$groups = $phpgw->accounts->get_list('groups');
 
 	while (list(,$group) = each($groups))
 	{
@@ -373,10 +377,10 @@
 	// check if we have something included, when not ne need to set
 	// {gui_hooks} to ""
 	//  	if ($phpgw->common->hook_single("show_newuser_data", $value)) $includedSomething="true";
-	//  }       
+	//  }
 
 	$phpgw->template->set_var('lang_button',Lang('Add'));
 	$phpgw->template->pfp('out','form');
-  
+
 	$phpgw->common->phpgw_footer();
 ?>
diff --git a/admin/newapplication.php b/admin/newapplication.php
index 7fa8caf99e..919e9ea794 100644
--- a/admin/newapplication.php
+++ b/admin/newapplication.php
@@ -11,98 +11,118 @@
 
   /* $Id$ */
 
-  $phpgw_info = array();
-  $phpgw_info["flags"] = array("currentapp" => "admin", "noheader" => True, "nonavbar" => True,
-                               "enable_nextmatchs_class" => True);
-  include("../header.inc.php");
+	$phpgw_info = array();
+	$phpgw_info['flags'] = array(
+		'currentapp' => 'admin',
+		'noheader' => True,
+		'nonavbar' => True,
+		'enable_nextmatchs_class' => True
+	);
+	include('../header.inc.php');
 
-  $phpgw->template->set_file(array("form" => "application_form.tpl",
-                                   "row"  => "application_form_row.tpl"
-                                  ));
+	$phpgw->template->set_file(array(
+		'form' => 'application_form.tpl',
+		'row'  => 'application_form_row.tpl'
+	));
 
-  function display_row($label, $value)
-  {
-     global $phpgw;
-     $phpgw->template->set_var("tr_color",$phpgw->nextmatchs->alternate_row_color());
-     $phpgw->template->set_var("label",$label);
-     $phpgw->template->set_var("value",$value);
+	function display_row($label, $value)
+	{
+		global $phpgw;
+		$phpgw->template->set_var('tr_color',$phpgw->nextmatchs->alternate_row_color());
+		$phpgw->template->set_var('label',$label);
+		$phpgw->template->set_var('value',$value);
 
-     $phpgw->template->parse("rows","row",True);
-  }
+		$phpgw->template->parse('rows','row',True);
+	}
 
-  if ($submit) {
-     $totalerrors = 0;
+	if ($submit)
+	{
+		$totalerrors = 0;
 
-     if (! $app_order) {
-        $app_order = 0;
-     }
-  
-     $phpgw->db->query("select count(*) from phpgw_applications where app_name='"
-               . addslashes($n_app_name) . "'",__LINE__,__FILE__);
-     $phpgw->db->next_record();
-     
-     if ($phpgw->db->f(0) != 0) {
-        $error[$totalerrors++] = lang("That application name already exsists.");
-     }
-     
-     if (preg_match("/\D/",$app_order)) {
-        $error[$totalerrors++] = lang("That application order must be a number.");
-     }
-  
-     if (! $n_app_name)
-        $error[$totalerrors++] = lang("You must enter an application name.");
+		if (! $app_order)
+		{
+			$app_order = 0;
+		}
 
-     if (! $n_app_title)
-        $error[$totalerrors++] = lang("You must enter an application title.");
-     
-     if (! $totalerrors) {
-        $phpgw->db->query("insert into phpgw_applications (app_name,app_title,app_enabled,app_order) values('"
-                     . addslashes($n_app_name) . "','" . addslashes($n_app_title) . "','"
-                     . "$n_app_status','$app_order')",__LINE__,__FILE__);
+		$phpgw->db->query("select count(*) from phpgw_applications where app_name='"
+			. addslashes($n_app_name) . "'",__LINE__,__FILE__);
+		$phpgw->db->next_record();
 
-        if($n_app_anonymous) {
-          $phpgw->acl->add_repository($n_app_name,'everywhere',0,PHPGW_ACL_READ);
-        }
+		if ($phpgw->db->f(0) != 0)
+		{
+			$error[$totalerrors++] = lang("That application name already exsists.");
+		}
 
-        Header("Location: " . $phpgw->link("/admin/applications.php"));
-        $phpgw->common->phpgw_exit();
-     } else {
-        $phpgw->template->set_var("error","<p><center>" . $phpgw->common->error_list($error) . "</center><br>");
-     }
-  } else {     // else submit
-     $phpgw->template->set_var("error","");
-  }
-  $phpgw->common->phpgw_header();
-  echo parse_navbar();
+		if (preg_match("/\D/",$app_order))
+		{
+			$error[$totalerrors++] = lang("That application order must be a number.");
+		}
 
-  $phpgw->template->set_var("lang_header",lang("Add new application"));
-  $phpgw->template->set_var("th_bg",$phpgw_info["theme"]["th_bg"]);
+		if (! $n_app_name)
+		{
+			$error[$totalerrors++] = lang("You must enter an application name.");
+		}
 
-  $phpgw->template->set_var("hidden_vars","");
-  $phpgw->template->set_var("form_action",$phpgw->link("/admin/newapplication.php"));
+		if (! $n_app_title)
+		{
+			$error[$totalerrors++] = lang("You must enter an application title.");
+		}
 
-  display_row(lang("application name"),'<input name="n_app_name" value="' . $n_app_name . '">');
-  display_row(lang("application title"),'<input name="n_app_title" value="' . $n_app_title . '">');
+		if (! $totalerrors)
+		{
+			$phpgw->db->query("insert into phpgw_applications (app_name,app_title,app_enabled,app_order) values('"
+				. addslashes($n_app_name) . "','" . addslashes($n_app_title) . "','"
+				. "$n_app_status','$app_order')",__LINE__,__FILE__);
 
-  if(!isset($n_app_status)) $n_app_status = 1;
-  $selected[$n_app_status] = " selected";
-  $status_html = '<option value="0"' . $selected[0] . '>' . lang("Disabled") . '</option>'
-               . '<option value="1"' . $selected[1] . '>' . lang("Enabled")  . '</option>'
-               . '<option value="2"' . $selected[2] . '>' . lang("Enabled - Hidden from navbar")  . '</option>';
-  display_row(lang("Status"),'<select name="n_app_status">' . $status_html . '</select>');
+			if($n_app_anonymous)
+			{
+				$phpgw->acl->add_repository($n_app_name,'everywhere',0,PHPGW_ACL_READ);
+			}
 
-  if (! $app_order) {
-     $phpgw->db->query("select (max(app_order)+1) as max from phpgw_applications");
-     $phpgw->db->next_record();
-     $app_order = $phpgw->db->f("max");
-  }
+			Header("Location: " . $phpgw->link("/admin/applications.php"));
+			$phpgw->common->phpgw_exit();
+		}
+		else
+		{
+			$phpgw->template->set_var("error","<p><center>" . $phpgw->common->error_list($error) . "</center><br>");
+		}
+	}
+	else
+	{     // else submit
+		$phpgw->template->set_var("error","");
+	}
+	$phpgw->common->phpgw_header();
+	echo parse_navbar();
 
-  display_row(lang("Select which location this app should appear on the navbar, lowest (left) to highest (right)"),'<input name="app_order" value="' . $app_order . '">');
+	$phpgw->template->set_var("lang_header",lang("Add new application"));
+	$phpgw->template->set_var("th_bg",$phpgw_info["theme"]["th_bg"]);
 
-  display_row(lang("Allow Anonymous access to this app"),'<input type="checkbox" name="n_app_anonymous" value="True">');
+	$phpgw->template->set_var("hidden_vars","");
+	$phpgw->template->set_var("form_action",$phpgw->link("/admin/newapplication.php"));
 
-  $phpgw->template->set_var("lang_submit_button",lang("add"));
+	display_row(lang("application name"),'<input name="n_app_name" value="' . $n_app_name . '">');
+	display_row(lang("application title"),'<input name="n_app_title" value="' . $n_app_title . '">');
 
-  $phpgw->template->pparse("out","form");
-  $phpgw->common->phpgw_footer();
+	if(!isset($n_app_status)) { $n_app_status = 1; }
+	$selected[$n_app_status] = " selected";
+	$status_html = '<option value="0"' . $selected[0] . '>' . lang("Disabled") . '</option>'
+		. '<option value="1"' . $selected[1] . '>' . lang("Enabled") . '</option>'
+		. '<option value="2"' . $selected[2] . '>' . lang("Enabled - Hidden from navbar") . '</option>';
+	display_row(lang("Status"),'<select name="n_app_status">' . $status_html . '</select>');
+
+	if (! $app_order)
+	{
+		$phpgw->db->query("select (max(app_order)+1) as max from phpgw_applications");
+		$phpgw->db->next_record();
+		$app_order = $phpgw->db->f("max");
+	}
+
+	display_row(lang("Select which location this app should appear on the navbar, lowest (left) to highest (right)"),'<input name="app_order" value="' . $app_order . '">');
+
+	display_row(lang("Allow Anonymous access to this app"),'<input type="checkbox" name="n_app_anonymous" value="True">');
+
+	$phpgw->template->set_var("lang_submit_button",lang("add"));
+
+	$phpgw->template->pparse("out","form");
+	$phpgw->common->phpgw_footer();
 ?>
diff --git a/admin/newgroup.php b/admin/newgroup.php
index f1ba4d28be..c6bec53ddd 100755
--- a/admin/newgroup.php
+++ b/admin/newgroup.php
@@ -40,7 +40,7 @@
 			$error = '<br>' . lang('You must enter a group name.');
 		}
 		else
-		{     
+		{
 			if ($phpgw->accounts->exists($n_group))
 			{
 				$error = '<br>' . lang('Sorry, that group name has already been taken.');