diff --git a/mod/register.php b/mod/register.php
index 1370eb42f1..5e011cb9a9 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once('include/email.php');
+require_once('include/bbcode.php');
 
 if(! function_exists('register_post')) {
 function register_post(&$a) {
@@ -263,7 +264,7 @@ function register_content(&$a) {
 		'$realpeople' => $realpeople,
 		'$regtitle'  => t('Registration'),
 		'$registertext' =>((x($a->config,'register_text'))
-			? '<div class="error-message">' . $a->config['register_text'] . '</div>'
+			? bbcode($a->config['register_text'])
 			: "" ),
 		'$fillwith'  => $fillwith,
 		'$fillext'   => $fillext,
diff --git a/view/templates/register.tpl b/view/templates/register.tpl
index ff650e2470..15fcf29938 100644
--- a/view/templates/register.tpl
+++ b/view/templates/register.tpl
@@ -1,15 +1,11 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h3>{{$regtitle}}</h3>
 
 <form action="register" method="post" id="register-form">
 
 	<input type="hidden" name="photo" value="{{$photo}}" />
 
-	{{$registertext}}
+	{{if $registertext != ""}}<div class="error-message">{{$registertext}} </div>{{/if}}
+
 
 	<p id="register-realpeople">{{$realpeople}}</p>