diff --git a/mod/register.php b/mod/register.php
index 208f97bcb..faee66c26 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -214,7 +214,8 @@ function register_content(&$a) {
 		$oidlabel = '';
 	}
 	else {
-		$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" >';
+		$oidhtml = '<label for="register-openid" id="label-register-openid" >%s</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="%s" >';
+		$oidhtml_old = '<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" >';
 		$fillwith = t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.");
 		$fillext =  t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.');
 		$oidlabel = t("Your OpenID \x28optional\x29: ");
@@ -252,6 +253,7 @@ function register_content(&$a) {
 
 	$o = replace_macros($o, array(
 		'$oidhtml' => $oidhtml,
+        '$oidhtml_old' => $oidhtml_old,
 		'$invitations' => get_config('system','invitation_only'),
 		'$invite_desc' => t('Membership on this site is by invitation only.'),
 		'$invite_label' => t('Your invitation ID: '),
diff --git a/view/register.tpl b/view/register.tpl
index 7cf11881a..ed96f969b 100644
--- a/view/register.tpl
+++ b/view/register.tpl
@@ -12,7 +12,7 @@
 	<p id="register-fill-ext">$fillext</p>
 
 	<div id="register-openid-wrapper" >
-			$oidhtml
+			$oidhtml_old
 	</div>
 	<div id="register-openid-end" ></div>
 
diff --git a/view/smarty3/register.tpl b/view/smarty3/register.tpl
index bdec2ffb4..899a9a25a 100644
--- a/view/smarty3/register.tpl
+++ b/view/smarty3/register.tpl
@@ -12,7 +12,7 @@
 	<p id="register-fill-ext">{{$fillext}}</p>
 
 	<div id="register-openid-wrapper" >
-			{{$oidhtml}}
+			{{$oidhtml|sprintf:$oidlabel:$openid}}
 	</div>
 	<div id="register-openid-end" ></div>
 
@@ -41,7 +41,7 @@
 	</div>
 	<div id="register-email-end" ></div>
 
-	<p id="register-nickname-desc" >{{$nickdesc}}</p>
+	<p id="register-nickname-desc" >{{$nickdesc|replace:'$sitename':$sitename}}</p>
 
 	<div id="register-nickname-wrapper" >
 		<label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>
diff --git a/view/theme/frost-mobile/register.tpl b/view/theme/frost-mobile/register.tpl
index cbc58a784..9844049b1 100644
--- a/view/theme/frost-mobile/register.tpl
+++ b/view/theme/frost-mobile/register.tpl
@@ -12,7 +12,7 @@
 
 	<br />
 	<div id="register-openid-wrapper"  class="field input" >
-			$oidhtml
+			$oidhtml_old
 	</div>
 	<div id="register-openid-end" ></div>
 
diff --git a/view/theme/frost-mobile/smarty3/register.tpl b/view/theme/frost-mobile/smarty3/register.tpl
index 62b147a8e..f73cd258b 100644
--- a/view/theme/frost-mobile/smarty3/register.tpl
+++ b/view/theme/frost-mobile/smarty3/register.tpl
@@ -12,7 +12,7 @@
 
 	<br />
 	<div id="register-openid-wrapper"  class="field input" >
-			{{$oidhtml}}
+			{{$oidhtml|sprintf:$oidlabel:$openid}}
 	</div>
 	<div id="register-openid-end" ></div>
 
@@ -54,7 +54,7 @@
 	<div id="register-nickname-end" ></div>
 
 	<div class="register-explain-wrapper">
-	<p id="register-nickname-desc" >{{$nickdesc}}</p>
+	<p id="register-nickname-desc" >{{$nickdesc|replace:'$sitename':$sitename}}</p>
 	</div>
 
 	{{$publish}}
diff --git a/view/theme/frost/register.tpl b/view/theme/frost/register.tpl
index 89dcffdf2..7df552e3f 100644
--- a/view/theme/frost/register.tpl
+++ b/view/theme/frost/register.tpl
@@ -12,7 +12,7 @@
 
 	<br />
 	<div id="register-openid-wrapper"  class="field input" >
-			$oidhtml
+			$oidhtml_old
 	</div>
 	<div id="register-openid-end" ></div>
 
diff --git a/view/theme/frost/smarty3/register.tpl b/view/theme/frost/smarty3/register.tpl
index 6b8e85a03..198223918 100644
--- a/view/theme/frost/smarty3/register.tpl
+++ b/view/theme/frost/smarty3/register.tpl
@@ -12,7 +12,7 @@
 
 	<br />
 	<div id="register-openid-wrapper"  class="field input" >
-			{{$oidhtml}}
+			{{$oidhtml|sprintf:$oidlabel:$openid}}
 	</div>
 	<div id="register-openid-end" ></div>
 
@@ -55,7 +55,7 @@
 	<div id="register-nickname-end" ></div>
 
 	<div class="register-explain-wrapper">
-	<p id="register-nickname-desc" >{{$nickdesc}}</p>
+	<p id="register-nickname-desc" >{{$nickdesc|replace:'$sitename':$sitename}}</p>
 	</div>
 
 	{{$publish}}