diff --git a/mod/register.php b/mod/register.php
index f74f571463..fc7301d523 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -230,7 +230,9 @@ function register_content(&$a) {
 
 	$o = file_get_contents("view/register.tpl");
 	$o = replace_macros($o, array(
-		'$registertext' =>((x($a->config,'register_text'))? $a->config['register_text'] : "" ),
+		'$registertext' =>((x($a->config,'register_text'))
+			? '<div class="error-message">' . $a->config['register_text'] . '</div>'
+			: "" ),
 		'$sitename' => $a->get_hostname()
 	));
 	return $o;
diff --git a/view/register.tpl b/view/register.tpl
index 29da2194bb..441015bd02 100644
--- a/view/register.tpl
+++ b/view/register.tpl
@@ -1,7 +1,9 @@
 <h3>Registration</h3>
 
 <form action="register" method="post" >
-	<div class="error-message">$registertext</div>
+
+	$registertext
+
 	<div id="register-name-wrapper" >
 		<label for="register-name" id="label-register-name" >Your Full Name (e.g. Joe Smith): </label>
 		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="" >
@@ -16,8 +18,8 @@
 	<div id="register-email-end" ></div>
 
 	<p id="register-nickname-desc" >
-	You will use a unique nickname to identify yourself in our social network. This must begin with a text character.
-	Your profile identifier will then be '<strong>nickname@$sitename</strong>'.
+	Choose a profile nickname. This must begin with a text character.
+	Your global profile locator will then be '<strong>nickname@$sitename</strong>'.
 	</p>
 	<div id="register-nickname-wrapper" >
 		<label for="register-nickname" id="label-register-nickname" >Choose a nickname: </label>