diff --git a/admin/editapplication.php b/admin/editapplication.php
index 1d0fc9191a..a4c0627698 100644
--- a/admin/editapplication.php
+++ b/admin/editapplication.php
@@ -48,9 +48,7 @@
   } else {
      $t->set_var("error","");
   }
-  $t->set_var("session_hidden_var","<input type=\"hidden\" "
-				 . "name=\"old_app_name\" value=\""
-				 . $phpgw->db->f("app_name") . "\">");
+  $t->set_var("hidden_vars",'<input type="hidden" name="old_app_name" value="' . $phpgw->db->f("app_name") . '">');
 
   $t->set_var("form_action",$phpgw->link("editapplication.php"));
   $t->set_var("lang_app_name",lang_admin("application name"));
diff --git a/admin/editgroup.php b/admin/editgroup.php
index aad86369f0..f47924246d 100755
--- a/admin/editgroup.php
+++ b/admin/editgroup.php
@@ -15,11 +15,13 @@
      $phpgw_flags = array("noheader" => True, "nonavbar" => True);
   }
 
-  if (! $group_id)
-     Header("Location: " . $phpgw->link("groups.php"));
-
   $phpgw_flags["currentapp"] = "admin";
   include("../header.inc.php");
+  
+  if (! $group_id) {
+     Header("Location: " . $phpgw->link("groups.php"));
+  }
+
 
   $t = new Template($phpgw_info["server"]["template_dir"]);
   $t->set_file(array("form"	=> "groups_form.tpl"));