diff --git a/ext/user/main.php b/ext/user/main.php
index 838e3a3f..5c43840d 100644
--- a/ext/user/main.php
+++ b/ext/user/main.php
@@ -51,6 +51,7 @@ class UserPage extends SimpleExtension {
 		$config->set_default_int("login_memory", 365);
 		$config->set_default_string("avatar_host", "gravatar");
 		$config->set_default_string("avatar_gravatar_options", "");
+		$config->set_default_bool("login_tac_bbcode", true);
 	}
 
 	public function onPageRequest(Event $event) {
diff --git a/ext/user/theme.php b/ext/user/theme.php
index dfd0e563..5d3ffbbb 100644
--- a/ext/user/theme.php
+++ b/ext/user/theme.php
@@ -41,9 +41,11 @@ class UserPageTheme extends Themelet {
 		global $config;
 		$tac = $config->get_string("login_tac", "");
 
-		$tfe = new TextFormattingEvent($tac);
-		send_event($tfe);
-		$tac = $tfe->formatted;
+		if($config->get_bool("login_tac_bbcode")) {
+			$tfe = new TextFormattingEvent($tac);
+			send_event($tfe);
+			$tac = $tfe->formatted;
+		}
 
 		if(empty($tac)) {$html = "";}
 		else {$html = "<p>$tac</p>";}