diff --git a/modules/member/tpl/signup_form.html b/modules/member/tpl/signup_form.html
index 9b1b38628..bf0731f21 100644
--- a/modules/member/tpl/signup_form.html
+++ b/modules/member/tpl/signup_form.html
@@ -35,13 +35,12 @@
 				<input type="password" name="password" id="password" value=""/>
 			</li>
 			<li> 
-				<label for="password2">{$lang->password2} <em style="color:red">*</em></label>
+				<label for="password2">{$lang->password3} <em style="color:red">*</em></label>
 				<input type="password" name="password2" id="password2" value=""/>
 			</li>
-			<li loop="$formTags=>$formTag"> 
+			<li loop="$formTags=>$formTag" cond="$formTag->name != 'signature'"> 
 				<label>{$formTag->title}</label>
-				<block cond="$formTag->name != 'signature'">{$formTag->inputTag}</block>
-				<block cond="$formTag->name =='signature'">{$editor}</block>
+				{$formTag->inputTag}
 			</li>
 			<li> 
 				<label>{$lang->allow_mailing}</label>
@@ -51,7 +50,7 @@
 			<li> 
 				<label>{$lang->allow_message}</label>
 				<block loop="$lang->allow_message_type=>$key,$val">
-					<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
+					<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key || (!$member_info && $key == 'Y')" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
 				</block>
 			</li>
 		</ul>