diff --git a/phpgwapi/inc/footer.inc.php b/phpgwapi/inc/footer.inc.php
index 28cc892e94..3801c4a9b2 100644
--- a/phpgwapi/inc/footer.inc.php
+++ b/phpgwapi/inc/footer.inc.php
@@ -34,21 +34,9 @@
   $tpl->set_file(array("footer" => "footer.tpl"));
   $tpl->set_var("img_root",$phpgw_info["server"]["webserver_url"] . "/phpgwapi/templates/verdilak/images");
   $tpl->set_var("table_bg_color",$phpgw_info["theme"]["navbar_bg"]);
+  $tpl->set_var("showpoweredbyon",$phpgw_info["server"]["showpoweredbyon"]);
+  $tpl->set_var("version",$phpgw_info["server"]["versions"]["phpgwapi"]);
   echo $tpl->finish($tpl->parse("out","footer"));
-
-  // This will need to be converted into the classic template
-
-/*  if ($phpgw_info["server"]["showpoweredbyon"] == "bottom" && $phpgw_info["server"]["showpoweredbyon"] != "top") {
-     echo "<P>\n";
-     echo "<Table Width=100% Border=0 CellPadding=0 CellSpacing=0 BGColor=".$phpgw_info["theme"]["navbar_bg"].">\n";
-     echo " <TR><TD>";
-     echo "<P><P>\n" . lang("Powered by phpGroupWare version x",
-							$phpgw_info["server"]["versions"]["phpgwapi"]) . "<br>\n";
-     echo "</TD>";
-     if ($phpgw_info["flags"]["parent_page"])
-       echo "<td align=\"right\"><a href=\"".$phpgw->link($phpgw_info["flags"]["parent_page"])."\">".lang("up")."</a></td>";
-     echo "</TR>\n</Table>\n";
-  } */
   $phpgw->db->disconnect();
   
 ?>
diff --git a/phpgwapi/inc/phpgw_info.inc.php b/phpgwapi/inc/phpgw_info.inc.php
index dfed211265..9b99158a7b 100644
--- a/phpgwapi/inc/phpgw_info.inc.php
+++ b/phpgwapi/inc/phpgw_info.inc.php
@@ -28,10 +28,6 @@
 	  echo "!!! PLEASE CORRECT THIS SITUATION !!!";
   }
 
-  if (empty($phpgw_info["server"]["template_set"])){
-    $phpgw_info["server"]["template_set"] = "default";
-  }
-
   if (!isset($phpgw_domain)) { // make them fix their header
     echo "The administration is required to upgrade the header.inc.php file before you can continue.";
     exit;
diff --git a/phpgwapi/templates/default/footer.tpl b/phpgwapi/templates/default/footer.tpl
index 8b13789179..6dbed987ab 100644
--- a/phpgwapi/templates/default/footer.tpl
+++ b/phpgwapi/templates/default/footer.tpl
@@ -1 +1,29 @@
+<!-- BEGIN footer -->
+<P>
+<table border="0" cellspacing="0" cellpading="0" width="100%" bgcolor="{table_bg_color}">
+  <TR>
+    <TD>
+      <P><P>Powered by <a href=http://www.phpgroupware.org>phpGroupWare</a> version {version}<br>
+    </TD>
+  </TR>
+</Table>
+
+<!---
+// If we can figure out how to do this, then we will use it. until then I am leaving it here, out of the way.
+/*
+  if ($phpgw_info["server"]["showpoweredbyon"] == "bottom" && $phpgw_info["server"]["showpoweredbyon"] != "top") {
+     echo "<P>\n";
+     echo "<Table Width=100% Border=0 CellPadding=0 CellSpacing=0 BGColor=".$phpgw_info["theme"]["navbar_bg"].">\n";
+     echo " <TR><TD>";
+     echo "<P><P>\n" . lang("Powered by phpGroupWare version x",
+							$phpgw_info["server"]["versions"]["phpgwapi"]) . "<br>\n";
+     echo "</TD>";
+     if ($phpgw_info["flags"]["parent_page"])
+       echo "<td align=\"right\"><a href=\"".$phpgw->link($phpgw_info["flags"]["parent_page"])."\">".lang("up")."</a></td>";
+     echo "</TR>\n</Table>\n";
+  }
+*/
+--->
+
+<!-- END footer -->