diff --git a/common.inc.php b/common.inc.php
index 66a5f75..25c0705 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -766,7 +766,12 @@ function output_page_text($textname)
 		$q=mysql_query("SELECT * FROM pagetext WHERE textname='$textname' AND year='-1'");
 		$r=mysql_fetch_object($q);
 	}
-	echo nl2br(i18n($r->text));
+
+	//if it looks like we have HTML content, dont do a nl2br, if there's no html, then do the nl2br
+	if(strlen($r->text)==strlen(strip_tags($r->text)))
+		echo nl2br(i18n($r->text));
+	else
+		echo i18n($r->text);
 }
 
 function generatePassword()