--- loncom/interface/lonpreferences.pm	2009/05/27 17:14:56	1.164
+++ loncom/interface/lonpreferences.pm	2009/06/29 14:42:08	1.165
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.164 2009/05/27 17:14:56 bisitz Exp $
+# $Id: lonpreferences.pm,v 1.165 2009/06/29 14:42:08 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2085,6 +2085,14 @@ sub handler {
 	&print_main_menu($r);
     }
 
+    # Properly end the HTML page of all preference pages
+    # started in each sub routine
+    # Exception: print_main_menu has its own end_page call
+    unless (!exists $env{'form.action'} ||
+            $env{'form.action'} eq 'debugtoggle') {
+        $r->print(&Apache::loncommon::end_page());
+    }
+
     return OK;