diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php
index 3e91077ef3..5e1027a9df 100644
--- a/phpBB/admin/admin_board.php
+++ b/phpBB/admin/admin_board.php
@@ -122,7 +122,11 @@ $smtp_no = ( !$new['smtp_delivery'] ) ? "checked=\"checked\"" : "";
 $template->set_filenames(array(
 	"body" => "admin/board_config_body.tpl")
 );
-
+//
+// Escape any quotes in the site description for proper display in the text
+// box on the admin page 
+//
+$new['site_desc'] = htmlspecialchars($new['site_desc']);
 $template->assign_vars(array(
 	"S_CONFIG_ACTION" => append_sid("admin_board.$phpEx"),
 
@@ -301,4 +305,4 @@ $template->pparse("body");
 
 include('page_footer_admin.'.$phpEx);
 
-?>
\ No newline at end of file
+?>