diff --git a/view/templates/register.tpl b/view/templates/register.tpl
index b47d39b97..d79da2d33 100644
--- a/view/templates/register.tpl
+++ b/view/templates/register.tpl
@@ -35,17 +35,19 @@
 	<div id="register-name-end" ></div>
 
 
-	<div id="register-email-wrapper" >
-		<label for="register-email" id="label-register-email" >{{$addrlabel}}</label>
-		<input type="text" maxlength="60" size="32" name="field1" id="register-email" value="{{$email}}" required>
-	</div>
-	<div id="register-email-end" ></div>
+	{{if !$additional}}
+		<div id="register-email-wrapper" >
+			<label for="register-email" id="label-register-email" >{{$addrlabel}}</label>
+			<input type="text" maxlength="60" size="32" name="field1" id="register-email" value="{{$email}}" required>
+		</div>
+		<div id="register-email-end" ></div>
 
-	<div id="register-repeat-wrapper" >
-		<label for="register-repeat" id="label-register-repeat" >{{$addrlabel2}}</label>
-		<input type="text" maxlength="60" size="32" name="repeat" id="register-repeat" value="" required>
-	</div>
-	<div id="register-repeat-end" ></div>
+		<div id="register-repeat-wrapper" >
+			<label for="register-repeat" id="label-register-repeat" >{{$addrlabel2}}</label>
+			<input type="text" maxlength="60" size="32" name="repeat" id="register-repeat" value="" required>
+		</div>
+		<div id="register-repeat-end" ></div>
+	{{/if}}
 
 {{if $ask_password}}
 	{{include file="field_password.tpl" field=$password1}}
@@ -62,6 +64,10 @@
 
 	<input type="input" id=tarpit" name="email" style="display: none;" placeholder="Don't enter anything here"/>
 
+	{{if $additional}}
+		{{include file="field_password.tpl" field=$parent_password}}
+	{{/if}}
+
 {{if $permonly}}
 	{{include file="field_textarea.tpl" field=$permonlybox}}
 {{/if}}
@@ -83,8 +89,10 @@
 	</div>
 	<div id="register-submit-end" ></div>
 
-	<h3>{{$importh}}</h3>
-	<div id ="import-profile">
-		<a href="uimport">{{$importt}}</a>
-	</div>
+	{{if !$additional}}
+		<h3>{{$importh}}</h3>
+		<div id ="import-profile">
+			<a href="uimport">{{$importt}}</a>
+		</div>
+	{{/if}}
 </form>