diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index e2788af6f2..05ae41e84f 100755
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -23,6 +23,8 @@
 	     This is for the todo list and addressbook.
 	   - Added a search field and next matchs icons to accounts and groups form.
 	   - Fixed the "code" messages not showing up after adding new entrys and what not.
+	   - Started converting the admin section to work off templates
+	   - Started converting the todo list to work off templates
 
 [08152000] - Fixed a problem with the calendar not showing the months in the users
 	     langague preference.
diff --git a/preferences/changepassword.php b/preferences/changepassword.php
index 79f83b2bbb..d96b4fa46b 100755
--- a/preferences/changepassword.php
+++ b/preferences/changepassword.php
@@ -58,6 +58,7 @@ if (! $submit) {
             		   . "need to be done manually."); ?>
    </pre>
 <?php
+  include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
 } else {
    if ($n_passwd != $n_passwd_2)
       $error = lang_pref("the two passwords are not the same");
diff --git a/preferences/settings.php b/preferences/settings.php
index 4b278a9022..dbb137c1d6 100755
--- a/preferences/settings.php
+++ b/preferences/settings.php
@@ -260,6 +260,7 @@
        </tr>
        </table>
       </form>
+
  <?php
   } else {
      $phpgw->db->query("delete from preferences where owner='" . $phpgw->session->loginid