diff --git a/view/smarty3/register.tpl b/view/smarty3/register.tpl
index 6e20bea39..768ca9387 100644
--- a/view/smarty3/register.tpl
+++ b/view/smarty3/register.tpl
@@ -43,7 +43,7 @@
 	</div>
 	<div id="register-email-end" ></div>
 
-	<p id="register-nickname-desc" >{{$nickdesc|replace:'$sitename':$sitename}}</p>
+	<p id="register-nickname-desc" >{{$nickdesc}}</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 9844049b1..041be5e96 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_old
+{{ 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 f73cd258b..bc0ce4cc9 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|sprintf:$oidlabel:$openid}}
+{{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>
@@ -54,7 +56,7 @@
 	<div id="register-nickname-end" ></div>
 
 	<div class="register-explain-wrapper">
-	<p id="register-nickname-desc" >{{$nickdesc|replace:'$sitename':$sitename}}</p>
+	<p id="register-nickname-desc" >{{$nickdesc}}</p>
 	</div>
 
 	{{$publish}}
diff --git a/view/theme/frost/register.tpl b/view/theme/frost/register.tpl
index 7df552e3f..15ce5040e 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_old
+{{ 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 198223918..72b628f39 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|sprintf:$oidlabel:$openid}}
+{{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>
@@ -55,7 +57,7 @@
 	<div id="register-nickname-end" ></div>
 
 	<div class="register-explain-wrapper">
-	<p id="register-nickname-desc" >{{$nickdesc|replace:'$sitename':$sitename}}</p>
+	<p id="register-nickname-desc" >{{$nickdesc}}</p>
 	</div>
 
 	{{$publish}}