diff --git a/admin/editaccount.php b/admin/editaccount.php
index dc86cda881..f44c400bc6 100755
--- a/admin/editaccount.php
+++ b/admin/editaccount.php
@@ -51,9 +51,9 @@
      }
      
      if (! $totalerrors) {
-        $cd = account_edit(array("loginid"   => $n_loginid,   "permissions"    => $new_permissions,
-                                 "firstname" => $n_firstname, "lastname"       => $n_lastname,
-                        	     "passwd"    => $n_passwd,    "account_status" => $n_account_status,
+        $cd = account_edit(array("loginid"   => $n_loginid,     "permissions"    => $new_permissions,
+                                 "firstname" => $n_firstname,   "lastname"       => $n_lastname,
+                                 "passwd"    => $n_passwd,      "account_status" => $n_account_status,
                                  "old_loginid" => $old_loginid, "account_id"     => rawurldecode($account_id),
                                  "groups"    => $phpgw->accounts->groups_array_to_string($n_groups)));
      }
@@ -126,7 +126,7 @@
      }
   }
 
-  for ($i=0;$i<200;) {		// The $i<200 is only used for a brake
+  for ($i=0;$i<200;) {     // The $i<200 is only used for a brake
      if (! $perm_display[$i][1]) break;
      $perm_html .= '<tr><td>' . lang($perm_display[$i][1]) . '</td>'
                  . '<td><input type="checkbox" name="new_permissions['
@@ -157,14 +157,14 @@
 ?>
     <form method="POST" action="<?php echo $phpgw->link("editaccount.php"); ?>">
       <input type="hidden" name="account_id" value="<? 
-	if ($phpgw_info["server"]["account_repository"] == "ldap")
-	{
-		echo rawurlencode($userData["account_dn"]);
-	}
-	else
-	{
-		echo $userData["account_id"]; 
-	}?>">
+   if ($phpgw_info["server"]["account_repository"] == "ldap")
+   {
+      echo rawurlencode($userData["account_dn"]);
+   }
+   else
+   {
+      echo $userData["account_id"]; 
+   }?>">
       <input type="hidden" name="old_loginid" value="<? echo $userData["account_lid"]; ?>">
 <?php
   if ($error) {
@@ -195,11 +195,11 @@
             while ($phpgw->db->next_record()) {
               echo "<option value=\"" . $phpgw->db->f("group_id") . "\"";
               for ($i=0; $i<count($user_groups); $i++) {
-		if ($user_groups[$i][0] == $phpgw->db->f("group_id")) {
+      if ($user_groups[$i][0] == $phpgw->db->f("group_id")) {
                   echo " selected";
                 }
-	      }
-	      echo ">" . $phpgw->db->f("group_name") . "</option>\n";
+         }
+         echo ">" . $phpgw->db->f("group_name") . "</option>\n";
             }
 ?>
             </select>
@@ -212,13 +212,13 @@
                 $perm_display[$i][1] = $permission[1]["title"];
                 $i++;
               }
-	       }
+          }
 
-            for ($i=0;$i<200;) {		// The $i<200 is only used for a brake
+            for ($i=0;$i<200;) {    // The $i<200 is only used for a brake
               if (! $perm_display[$i][1]) break;
               echo '<tr><td>' . lang($perm_display[$i][1]) . '</td>'
                 . '<td><input type="checkbox" name="new_permissions['
-		            . $perm_display[$i][0] . ']" value="True"';
+                  . $perm_display[$i][0] . ']" value="True"';
               if ($new_permissions[$perm_display[$i][0]] || $db_perms[$perm_display[$i][0]]) {
                  echo " checked";
               }
@@ -227,20 +227,20 @@
               if (! $perm_display[$i][1]) break;
               echo '<td>' . lang($perm_display[$i][1]) . '</td>'
                 . '<td><input type="checkbox" name="new_permissions['
-		            . $perm_display[$i][0] . ']" value="True"';
+                  . $perm_display[$i][0] . ']" value="True"';
               if ($new_permissions[$perm_display[$i][0]] || $db_perms[$perm_display[$i][0]]) {
                 echo " checked";
               }
-	 	          echo "></td></tr>";
+                echo "></td></tr>";
               $i++;
             }
 ?>
           <tr>
            <td><?php echo lang("Account active"); ?></td>
            <td>
-           	<input type="checkbox" name="n_account_status" value="A"
-           		<?php if ($userData["status"] == "A") { echo " checked"; } ?> 
-           	>
+            <input type="checkbox" name="n_account_status" value="A"
+               <?php if ($userData["status"] == "A") { echo " checked"; } ?> 
+            >
           </td>
           </tr>
           <tr>
diff --git a/admin/newaccount.php b/admin/newaccount.php
index 7c23f7f123..cf3726986b 100755
--- a/admin/newaccount.php
+++ b/admin/newaccount.php
@@ -72,9 +72,9 @@
 
      if (! $error) {
         $cd = account_add(array("loginid"   => $n_loginid,   "permissions" => $new_permissions,
-        				        "firstname" => $n_firstname, "lastname"    => $n_lastname,
-        				        "passwd"    => $n_passwd,
-        				        "groups"    => $phpgw->accounts->groups_array_to_string($n_groups)));
+            				        "firstname" => $n_firstname, "lastname"    => $n_lastname,
+            				        "passwd"    => $n_passwd,
+            				        "groups"    => $phpgw->accounts->groups_array_to_string($n_groups)));
         
         Header("Location: " . $phpgw->link("accounts.php","cd=$cd"));
         exit;
diff --git a/calendar/day.php b/calendar/day.php
index 65e0b07eeb..f904611134 100644
--- a/calendar/day.php
+++ b/calendar/day.php
@@ -1,4 +1,4 @@
-<?php php_track_vars?>
+<?php_track_vars?>
 <?php
   /**************************************************************************\
   * phpGroupWare - Calendar                                                  *
diff --git a/calendar/delete.php b/calendar/delete.php
index ec1a599bd5..3ba36cf0c0 100755
--- a/calendar/delete.php
+++ b/calendar/delete.php
@@ -1,4 +1,4 @@
-<?phpphp_track_vars?>
+<?php_track_vars?>
 <?php
   /**************************************************************************\
   * phpGroupWare - Calendar                                                  *
diff --git a/calendar/edit_entry.php b/calendar/edit_entry.php
index 3c8c64e7d6..4c8a0d2250 100755
--- a/calendar/edit_entry.php
+++ b/calendar/edit_entry.php
@@ -1,4 +1,4 @@
-<?php php_track_vars?>
+<?php_track_vars?>
 <?php
   /**************************************************************************\
   * phpGroupWare - Calendar                                                  *
diff --git a/calendar/edit_entry_handler.php b/calendar/edit_entry_handler.php
index a429587954..a5f0b76aff 100755
--- a/calendar/edit_entry_handler.php
+++ b/calendar/edit_entry_handler.php
@@ -1,4 +1,3 @@
-
 <?php_track_vars?>
 <?php
   /**************************************************************************\
diff --git a/calendar/search.php b/calendar/search.php
index 8939fe24a5..7ca0481dc3 100755
--- a/calendar/search.php
+++ b/calendar/search.php
@@ -1,4 +1,4 @@
-<?php php_track_vars?>
+<?php_track_vars?>
 <?php
   /**************************************************************************\
   * phpGroupWare - Calendar                                                  *
diff --git a/calendar/week.php b/calendar/week.php
index fda8dd74e3..8d1a0c80e0 100755
--- a/calendar/week.php
+++ b/calendar/week.php
@@ -1,4 +1,4 @@
-<?php php_track_vars?>
+<?php_track_vars?>
 <?php
   /**************************************************************************\
   * phpGroupWare - Calendar                                                  *