diff --git a/templates/Classic/customer/extras/htaccess_add.tpl b/templates/Classic/customer/extras/htaccess_add.tpl
index 69025abb..0377bb7c 100644
--- a/templates/Classic/customer/extras/htaccess_add.tpl
+++ b/templates/Classic/customer/extras/htaccess_add.tpl
@@ -5,44 +5,9 @@ $header
 		<input type="hidden" name="action" value="$action" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
 			<tr>
-				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['extras']['pathoptions_add']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">
-					<b>{$lng['panel']['path']}:</b><br />
-					<if $settings['panel']['pathedit'] != 'Dropdown'><font size="1">{$lng['panel']['pathDescription']}</font></if>
-				</td>
-				<td class="main_field_display" nowrap="nowrap">{$pathSelect}</td>
-			</tr>
-			<tr>
-				<td class="main_field_name"><b>{$lng['extras']['directory_browsing']}:</b></td>
-				<td class="main_field_display" nowrap="nowrap">$options_indexes</td>
-			</tr>
-			<tr>
-				<td class="main_field_name"><b>{$lng['extras']['errordocument404path']}:</b><br />{$lng['panel']['descriptionerrordocument']}</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="error404path" value="" size="30" maxlength="255" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name"><b>{$lng['extras']['errordocument403path']}:</b><br />{$lng['panel']['descriptionerrordocument']}
-				<if $settings['system']['webserver'] == 'lighttpd'><div style="color:red">{$lng['panel']['not_supported']}lighttpd</div></if>
-				</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="error403path" value="" size="30" maxlength="255" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name"><b>{$lng['extras']['errordocument500path']}:</b><br />{$lng['panel']['descriptionerrordocument']}
-				<if $settings['system']['webserver'] == 'lighttpd'><div style="color:red">{$lng['panel']['not_supported']}lighttpd</div></if>
-				</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="error500path" value="" size="30" maxlength="255" /></td>
-			</tr>
-			<if $cperlenabled == 1 >
-				<tr>
-					<td class="main_field_name"><b>{$lng['extras']['execute_perl']}:</b></td>
-					<td class="main_field_display" nowrap="nowrap">$options_cgi</td>
-				</tr>
-			</if>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['extras']['pathoptions_add']}" /></td>
+				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
 			</tr>
+			{$htaccess_add_form}
 		</table>
 	</form>
 	<br />
diff --git a/templates/Classic/customer/extras/htaccess_edit.tpl b/templates/Classic/customer/extras/htaccess_edit.tpl
index 1579e35a..c14936d7 100644
--- a/templates/Classic/customer/extras/htaccess_edit.tpl
+++ b/templates/Classic/customer/extras/htaccess_edit.tpl
@@ -6,41 +6,9 @@ $header
 		<input type="hidden" name="id" value="$id" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
 			<tr>
-				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['extras']['pathoptions_edit']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name"><b>{$lng['panel']['path']}:</b></td>
-				<td class="main_field_display" nowrap="nowrap">{$result['path']}</td>
-			</tr>
-			<tr>
-				<td class="main_field_name"><b>{$lng['extras']['directory_browsing']}:</b></td>
-				<td class="main_field_display" nowrap="nowrap">$options_indexes</td>
-			</tr>
-			<tr>
-				<td class="main_field_name"><b>{$lng['extras']['errordocument404path']}:</b><br />{$lng['panel']['descriptionerrordocument']}</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="error404path" value="{$result['error404path']}" size="30" maxlength="255" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name"><b>{$lng['extras']['errordocument403path']}:</b><br />{$lng['panel']['descriptionerrordocument']}
-				<if $settings['system']['webserver'] == 'lighttpd'><div style="color:red">{$lng['panel']['not_supported']}lighttpd</div></if>
-				</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="error403path" value="{$result['error403path']}" size="30" maxlength="255" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name"><b>{$lng['extras']['errordocument500path']}:</b><br />{$lng['panel']['descriptionerrordocument']}
-				<if $settings['system']['webserver'] == 'lighttpd'><div style="color:red">{$lng['panel']['not_supported']}lighttpd</div></if>
-				</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="error500path" value="{$result['error500path']}" size="30" maxlength="255" /></td>
-			</tr>
-			<if $cperlenabled == 1 >
-				<tr>
-					<td class="main_field_name"><b>{$lng['extras']['execute_perl']}:</b></td>
-					<td class="main_field_display" nowrap="nowrap">$options_cgi</td>
-				</tr>
-			</if>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['extras']['pathoptions_edit']}" /></td>
+				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
 			</tr>
+			{$htaccess_edit_form}
 		</table>
 	</form>
 	<br />
diff --git a/templates/Classic/customer/extras/htpasswds_add.tpl b/templates/Classic/customer/extras/htpasswds_add.tpl
index 60c9eae7..cd75df0e 100644
--- a/templates/Classic/customer/extras/htpasswds_add.tpl
+++ b/templates/Classic/customer/extras/htpasswds_add.tpl
@@ -5,30 +5,9 @@ $header
 		<input type="hidden" name="action" value="$action" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
 			<tr>
-				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['extras']['directoryprotection_add']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">
-					<b>{$lng['panel']['path']}:</b><br />
-					<if $settings['panel']['pathedit'] != 'Dropdown'><font size="1">{$lng['panel']['pathDescription']}</font></if>
-				</td>
-				<td class="main_field_display" nowrap="nowrap">{$pathSelect}</td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['login']['username']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="username" size="30" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['login']['password']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="password" name="directory_password" size="30" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['extras']['htpasswdauthname']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" name="directory_authname" size="30" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['extras']['directoryprotection_add']}" /></td>
+				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
 			</tr>
+			{$htpasswd_add_form}
 		</table>
 	</form>
 	<br />
diff --git a/templates/Classic/customer/extras/htpasswds_edit.tpl b/templates/Classic/customer/extras/htpasswds_edit.tpl
index 0dd6af31..290d2331 100644
--- a/templates/Classic/customer/extras/htpasswds_edit.tpl
+++ b/templates/Classic/customer/extras/htpasswds_edit.tpl
@@ -6,27 +6,9 @@ $header
 		<input type="hidden" name="id" value="$id" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
 			<tr>
-				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['extras']['directoryprotection_edit']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['panel']['path']}:</td>
-				<td class="main_field_display" nowrap="nowrap">{$result['path']}</td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['login']['username']}:</td>
-				<td class="main_field_display" nowrap="nowrap">{$result['username']}</td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['login']['password']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="password" name="directory_password" maxlength="50" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['extras']['htpasswdauthname']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" name="directory_authname" value="{$result['authname']}" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['extras']['directoryprotection_edit']}" /></td>
+				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
 			</tr>
+			{$htpasswd_edit_form}
 		</table>
 	</form>
 	<br />

{$lng['extras']['pathoptions_add']}
- {$lng['panel']['path']}: - {$lng['panel']['pathDescription']} -	{$pathSelect}
{$lng['extras']['directory_browsing']}:	$options_indexes
{$lng['extras']['errordocument404path']}: {$lng['panel']['descriptionerrordocument']}
{$lng['extras']['errordocument403path']}: {$lng['panel']['descriptionerrordocument']} - {$lng['panel']['not_supported']}lighttpd -
{$lng['extras']['errordocument500path']}: {$lng['panel']['descriptionerrordocument']} - {$lng['panel']['not_supported']}lighttpd -
{$lng['extras']['execute_perl']}:	$options_cgi
		{$title}
{$lng['extras']['pathoptions_edit']}
{$lng['panel']['path']}:	{$result['path']}
{$lng['extras']['directory_browsing']}:	$options_indexes
{$lng['extras']['errordocument404path']}: {$lng['panel']['descriptionerrordocument']}
{$lng['extras']['errordocument403path']}: {$lng['panel']['descriptionerrordocument']} - {$lng['panel']['not_supported']}lighttpd -
{$lng['extras']['errordocument500path']}: {$lng['panel']['descriptionerrordocument']} - {$lng['panel']['not_supported']}lighttpd -
{$lng['extras']['execute_perl']}:	$options_cgi
		{$title}
{$lng['extras']['directoryprotection_add']}
- {$lng['panel']['path']}: - {$lng['panel']['pathDescription']} -	{$pathSelect}
{$lng['login']['username']}:
{$lng['login']['password']}:
{$lng['extras']['htpasswdauthname']}:
		{$title}
{$lng['extras']['directoryprotection_edit']}
{$lng['panel']['path']}:	{$result['path']}
{$lng['login']['username']}:	{$result['username']}
{$lng['login']['password']}:
{$lng['extras']['htpasswdauthname']}:
		{$title}