diff --git a/mod/register.php b/mod/register.php
index 208f97bcb6..f4c6570877 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -239,7 +239,6 @@ function register_content(&$a) {
 		));
 	}
 
-
 	$license = '';
 
 	$o = get_markup_template("register.tpl");
@@ -267,7 +266,7 @@ function register_content(&$a) {
 		'$openid'    => $openid_url,
 		'$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '),
 		'$addrlabel' => t('Your Email Address: '),
-		'$nickdesc'  => t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.'),
+		'$nickdesc'  => str_replace('$sitename',$a->get_hostname(),t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.')),
 		'$nicklabel' => t('Choose a nickname: '),
 		'$photo'     => $photo,
 		'$publish'   => $profile_publish,
diff --git a/view/register.tpl b/view/register.tpl
index 7cf11881ad..2275356a21 100644
--- a/view/register.tpl
+++ b/view/register.tpl
@@ -11,10 +11,12 @@
 	<p id="register-fill-desc">$fillwith</p>
 	<p id="register-fill-ext">$fillext</p>
 
+{{ if $oidlabel }}
 	<div id="register-openid-wrapper" >
-			$oidhtml
+    	<label for="register-openid" id="label-register-openid" >$oidlabel</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >
 	</div>
 	<div id="register-openid-end" ></div>
+{{ endif }}
 
 {{ if $invitations }}
 
diff --git a/view/smarty3/register.tpl b/view/smarty3/register.tpl
index bdec2ffb4f..768ca93878 100644
--- a/view/smarty3/register.tpl
+++ b/view/smarty3/register.tpl
@@ -11,10 +11,12 @@
 	<p id="register-fill-desc">{{$fillwith}}</p>
 	<p id="register-fill-ext">{{$fillext}}</p>
 
+{{if $oidlabel }}
 	<div id="register-openid-wrapper" >
-			{{$oidhtml}}
+    	<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" 	id="register-openid" value="{{$openid}}" >
 	</div>
 	<div id="register-openid-end" ></div>
+{{/if}}
 
 {{if $invitations}}
 
diff --git a/view/theme/frost-mobile/register.tpl b/view/theme/frost-mobile/register.tpl
index cbc58a7846..041be5e96e 100644
--- a/view/theme/frost-mobile/register.tpl
+++ b/view/theme/frost-mobile/register.tpl
@@ -11,10 +11,12 @@
 	<p id="register-realpeople">$realpeople</p>
 
 	<br />
-	<div id="register-openid-wrapper"  class="field input" >
-			$oidhtml
+{{ if $oidlabel }}
+	<div id="register-openid-wrapper" >
+    	<label for="register-openid" id="label-register-openid" >$oidlabel</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >
 	</div>
 	<div id="register-openid-end" ></div>
+{{ endif }}
 
 	<div class="register-explain-wrapper">
 	<p id="register-fill-desc">$fillwith $fillext</p>
diff --git a/view/theme/frost-mobile/smarty3/register.tpl b/view/theme/frost-mobile/smarty3/register.tpl
index 62b147a8ee..bc0ce4cc9c 100644
--- a/view/theme/frost-mobile/smarty3/register.tpl
+++ b/view/theme/frost-mobile/smarty3/register.tpl
@@ -11,10 +11,12 @@
 	<p id="register-realpeople">{{$realpeople}}</p>
 
 	<br />
-	<div id="register-openid-wrapper"  class="field input" >
-			{{$oidhtml}}
+{{if $oidlabel }}
+	<div id="register-openid-wrapper" >
+    	<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" 	id="register-openid" value="{{$openid}}" >
 	</div>
 	<div id="register-openid-end" ></div>
+{{/if}}
 
 	<div class="register-explain-wrapper">
 	<p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p>
diff --git a/view/theme/frost/register.tpl b/view/theme/frost/register.tpl
index 89dcffdf20..15ce5040e2 100644
--- a/view/theme/frost/register.tpl
+++ b/view/theme/frost/register.tpl
@@ -11,10 +11,12 @@
 	<p id="register-realpeople">$realpeople</p>
 
 	<br />
-	<div id="register-openid-wrapper"  class="field input" >
-			$oidhtml
+{{ if $oidlabel }}
+	<div id="register-openid-wrapper" >
+    	<label for="register-openid" id="label-register-openid" >$oidlabel</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >
 	</div>
 	<div id="register-openid-end" ></div>
+{{ endif }}
 
 	<div class="register-explain-wrapper">
 	<p id="register-fill-desc">$fillwith $fillext</p>
diff --git a/view/theme/frost/smarty3/register.tpl b/view/theme/frost/smarty3/register.tpl
index 6b8e85a03c..72b628f39d 100644
--- a/view/theme/frost/smarty3/register.tpl
+++ b/view/theme/frost/smarty3/register.tpl
@@ -11,10 +11,12 @@
 	<p id="register-realpeople">{{$realpeople}}</p>
 
 	<br />
-	<div id="register-openid-wrapper"  class="field input" >
-			{{$oidhtml}}
+{{if $oidlabel }}
+	<div id="register-openid-wrapper" >
+    	<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" 	id="register-openid" value="{{$openid}}" >
 	</div>
 	<div id="register-openid-end" ></div>
+{{/if}}
 
 	<div class="register-explain-wrapper">
 	<p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p>