diff --git a/templates/Classic/customer/email/account_add.tpl b/templates/Classic/customer/email/account_add.tpl
index 67ca6356..76b8b1a5 100644
--- a/templates/Classic/customer/email/account_add.tpl
+++ b/templates/Classic/customer/email/account_add.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'email'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="action" value="$action" />
diff --git a/templates/Classic/customer/email/account_changepw.tpl b/templates/Classic/customer/email/account_changepw.tpl
index 532246dc..7d1b32ca 100644
--- a/templates/Classic/customer/email/account_changepw.tpl
+++ b/templates/Classic/customer/email/account_changepw.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'email'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="action" value="$action" />
diff --git a/templates/Classic/customer/email/account_changequota.tpl b/templates/Classic/customer/email/account_changequota.tpl
index ab7464e4..fbca7003 100644
--- a/templates/Classic/customer/email/account_changequota.tpl
+++ b/templates/Classic/customer/email/account_changequota.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'email'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="action" value="$action" />
diff --git a/templates/Classic/customer/email/autoresponder.tpl b/templates/Classic/customer/email/autoresponder.tpl
index 98bad22f..8a148e93 100644
--- a/templates/Classic/customer/email/autoresponder.tpl
+++ b/templates/Classic/customer/email/autoresponder.tpl
@@ -13,10 +13,10 @@ $header
 		$autoresponder
 		<if ($userinfo['email_autoresponder_used'] < $userinfo['email_autoresponder'] || $userinfo['email_autoresponder'] == '-1') >
 		<tr>
-			<td class="field_display_border_left" colspan="5"><a href="$filename?&amp;action=add&amp;s=$s">{$lng['autoresponder']['autoresponder_add']}</a></td>
+			<td class="field_display_border_left" colspan="5"><a href="{$linker->getLink(array('section' => 'autoresponder', 'action' => 'add'))}">{$lng['autoresponder']['autoresponder_add']}</a></td>
 		</tr>
 		</if>
 	</table>
 	<br />
 	<br />
-$footer
\ No newline at end of file
+$footer
diff --git a/templates/Classic/customer/email/autoresponder_add.tpl b/templates/Classic/customer/email/autoresponder_add.tpl
index c9434e9d..37b9c446 100644
--- a/templates/Classic/customer/email/autoresponder_add.tpl
+++ b/templates/Classic/customer/email/autoresponder_add.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'autoresponder'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="action" value="$action" />
@@ -13,4 +13,4 @@ $header
 	</form>
 	<br />
 	<br />
-$footer
\ No newline at end of file
+$footer
diff --git a/templates/Classic/customer/email/autoresponder_autoresponder.tpl b/templates/Classic/customer/email/autoresponder_autoresponder.tpl
index 694892b7..c2378aff 100644
--- a/templates/Classic/customer/email/autoresponder_autoresponder.tpl
+++ b/templates/Classic/customer/email/autoresponder_autoresponder.tpl
@@ -2,6 +2,6 @@
 	<td class="field_name_border_left">{$row['email']}</td>
 	<td class="field_name"><if $row['enabled'] != 0>{$lng['panel']['yes']}</if><if $row['enabled'] == 0>{$lng['panel']['no']}</if></td>
 	<td class="field_name">$activated_date</td>
-	<td class="field_name"><a href="$filename?&amp;action=edit&amp;email={$row['email']}&amp;s=$s">{$lng['panel']['edit']}</a></td>
-	<td class="field_name"><a href="$filename?&amp;action=delete&amp;email={$row['email']}&amp;s=$s">{$lng['panel']['delete']}</a></td>
-</tr>
\ No newline at end of file
+	<td class="field_name"><a href="{$linker->getLink(array('section' => 'autoresponder', 'action' => 'edit', 'email' => $row['email']))}">{$lng['panel']['edit']}</a></td>
+	<td class="field_name"><a href="{$linker->getLink(array('section' => 'autoresponder', 'action' => 'delete', 'email' => $row['email']))}">{$lng['panel']['delete']}</a></td>
+</tr>
diff --git a/templates/Classic/customer/email/autoresponder_edit.tpl b/templates/Classic/customer/email/autoresponder_edit.tpl
index 2c812748..51670ab6 100644
--- a/templates/Classic/customer/email/autoresponder_edit.tpl
+++ b/templates/Classic/customer/email/autoresponder_edit.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'autoresponder'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="action" value="$action" />
diff --git a/templates/Classic/customer/email/emails.tpl b/templates/Classic/customer/email/emails.tpl
index d7b0c222..01a7623c 100644
--- a/templates/Classic/customer/email/emails.tpl
+++ b/templates/Classic/customer/email/emails.tpl
@@ -1,5 +1,5 @@
 $header
-	<form action="$filename" method="post">
+	<form action="{$linker->getLink(array('section' => 'email'))}" method="post">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
@@ -9,7 +9,7 @@ $header
 			</tr>
 			<if ($userinfo['emails_used'] < $userinfo['emails'] || $userinfo['emails'] == '-1') && 15 < $emails_count && $emaildomains_count !=0 >
 			<tr>
-				<td class="field_display_border_left" colspan="7"><a href="$filename?page={$page}&amp;action=add&amp;s=$s">{$lng['emails']['emails_add']}</a></td>
+				<td class="field_display_border_left" colspan="7"><a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'add'))}">{$lng['emails']['emails_add']}</a></td>
 			</tr>
 			</if>
 			<tr>
@@ -28,7 +28,7 @@ $header
 			</if>
 			<if ($userinfo['emails_used'] < $userinfo['emails'] || $userinfo['emails'] == '-1') && $emaildomains_count !=0 >
 			<tr>
-				<td class="field_display_border_left" colspan="7"><a href="$filename?page={$page}&amp;action=add&amp;s=$s">{$lng['emails']['emails_add']}</a></td>
+				<td class="field_display_border_left" colspan="7"><a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'add'))}">{$lng['emails']['emails_add']}</a></td>
 			</tr>
 			</if>
 		</table>
diff --git a/templates/Classic/customer/email/emails_add.tpl b/templates/Classic/customer/email/emails_add.tpl
index 68e70473..fb911f14 100644
--- a/templates/Classic/customer/email/emails_add.tpl
+++ b/templates/Classic/customer/email/emails_add.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'email'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="action" value="$action" />
diff --git a/templates/Classic/customer/email/emails_edit.tpl b/templates/Classic/customer/email/emails_edit.tpl
index 6b5f2738..f585e72c 100644
--- a/templates/Classic/customer/email/emails_edit.tpl
+++ b/templates/Classic/customer/email/emails_edit.tpl
@@ -1,12 +1,12 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'email'))}">
 		<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="$title" />&nbsp;{$title}</b></td>
 			</tr>
 			{$email_edit_form}
 			<tr>
-				<td class="maintitle" colspan="2"><a href="$filename?page=emails&amp;s=$s">{$lng['emails']['back_to_overview']}</a></td>
+				<td class="maintitle" colspan="2"><a href="{$linker->getLink(array('section' => 'email', 'page' => 'emails'))}">{$lng['emails']['back_to_overview']}</a></td>
 			</tr>
 		</table>
 	</form>
diff --git a/templates/Classic/customer/email/emails_edit_forwarder.tpl b/templates/Classic/customer/email/emails_edit_forwarder.tpl
index 181101c5..88467962 100644
--- a/templates/Classic/customer/email/emails_edit_forwarder.tpl
+++ b/templates/Classic/customer/email/emails_edit_forwarder.tpl
@@ -1,2 +1,2 @@
-$destination [<a href="$filename?page=forwarders&amp;action=delete&amp;id={$id}&amp;forwarderid={$dest_id}&amp;s=$s">{$lng['panel']['delete']}</a>]
+$destination [<a href="{$linker->getLink(array('section' => 'email', 'page' => 'forwarders', 'action' => 'delete', 'id' => $id, 'forwarderid' => $dest_id))}">{$lng['panel']['delete']}</a>]
 <br />
\ No newline at end of file
diff --git a/templates/Classic/customer/email/emails_email.tpl b/templates/Classic/customer/email/emails_email.tpl
index d4f73ef2..78c10c1d 100644
--- a/templates/Classic/customer/email/emails_email.tpl
+++ b/templates/Classic/customer/email/emails_email.tpl
@@ -4,6 +4,6 @@
 	<td class="field_name"><if $row['popaccountid'] != 0>{$lng['panel']['yes']}</if><if $row['popaccountid'] == 0>{$lng['panel']['no']}</if></td>
 	<td class="field_name"><if $row['iscatchall'] != 0>{$lng['panel']['yes']}</if><if $row['iscatchall'] == 0>{$lng['panel']['no']}</if></td>
 	<if $settings['system']['mail_quota_enabled'] == '1'><td class="field_name"><if $row['quota'] == 0>{$lng['emails']['noquota']}<else>{$row['quota']} MB</if></if></td>
-	<td class="field_name"><a href="$filename?page={$page}&amp;action=edit&amp;id={$row['id']}&amp;s=$s">{$lng['panel']['edit']}</a></td>
-	<td class="field_name"><a href="$filename?page={$page}&amp;action=delete&amp;id={$row['id']}&amp;s=$s">{$lng['panel']['delete']}</a></td>
+	<td class="field_name"><a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></td>
+	<td class="field_name"><a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a></td>
 </tr>
diff --git a/templates/Classic/customer/email/forwarder_add.tpl b/templates/Classic/customer/email/forwarder_add.tpl
index 9c484316..59bc2a42 100644
--- a/templates/Classic/customer/email/forwarder_add.tpl
+++ b/templates/Classic/customer/email/forwarder_add.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'email'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="action" value="$action" />
diff --git a/templates/Froxlor/customer/email/account_add.tpl b/templates/Froxlor/customer/email/account_add.tpl
index 35c9f233..530f7078 100644
--- a/templates/Froxlor/customer/email/account_add.tpl
+++ b/templates/Froxlor/customer/email/account_add.tpl
@@ -9,7 +9,7 @@ $header
 
 		<section class="fullform bradiusodd">
 
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/customer/email/account_changepw.tpl b/templates/Froxlor/customer/email/account_changepw.tpl
index 3a5a7ea7..0e2ce7b2 100644
--- a/templates/Froxlor/customer/email/account_changepw.tpl
+++ b/templates/Froxlor/customer/email/account_changepw.tpl
@@ -9,7 +9,7 @@ $header
 
 		<section class="fullform bradiusodd">
 
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/customer/email/account_changequota.tpl b/templates/Froxlor/customer/email/account_changequota.tpl
index 5550e05b..06918fd2 100644
--- a/templates/Froxlor/customer/email/account_changequota.tpl
+++ b/templates/Froxlor/customer/email/account_changequota.tpl
@@ -9,7 +9,7 @@ $header
 
 		<section class="fullform bradiusodd">
 
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/customer/email/autoresponder.tpl b/templates/Froxlor/customer/email/autoresponder.tpl
index a9fb3417..7c86c50c 100644
--- a/templates/Froxlor/customer/email/autoresponder.tpl
+++ b/templates/Froxlor/customer/email/autoresponder.tpl
@@ -12,7 +12,7 @@
 			<if ($userinfo['email_autoresponder_used'] < $userinfo['email_autoresponder'] || $userinfo['email_autoresponder'] == '-1') && 15 < $count >
 			<div class="overviewadd">
 				<img src="images/Froxlor/icons/autoresponder_add.png" alt="" />&nbsp;
-				<a href="$filename?&amp;action=add&amp;s=$s">{$lng['autoresponder']['autoresponder_add']}</a>
+				<a href="{$linker->getLink(array('section' => 'autoresponder', 'action' => 'add'))}">{$lng['autoresponder']['autoresponder_add']}</a>
 			</div>
 			</if>
 
@@ -34,7 +34,7 @@
 			<if ($userinfo['email_autoresponder_used'] < $userinfo['email_autoresponder'] || $userinfo['email_autoresponder'] == '-1') >
 			<div class="overviewadd">
 				<img src="images/Froxlor/icons/autoresponder_add.png" alt="" />&nbsp;
-				<a href="$filename?&amp;action=add&amp;s=$s">{$lng['autoresponder']['autoresponder_add']}</a>
+				<a href="{$linker->getLink(array('section' => 'autoresponder', 'action' => 'add'))}">{$lng['autoresponder']['autoresponder_add']}</a>
 			</div>
 			</if>
 
diff --git a/templates/Froxlor/customer/email/autoresponder_add.tpl b/templates/Froxlor/customer/email/autoresponder_add.tpl
index 8b40eaae..d920e458 100644
--- a/templates/Froxlor/customer/email/autoresponder_add.tpl
+++ b/templates/Froxlor/customer/email/autoresponder_add.tpl
@@ -9,7 +9,7 @@ $header
   
 		<section class="fullform bradiusodd">
 
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'autoresponder'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/customer/email/autoresponder_autoresponder.tpl b/templates/Froxlor/customer/email/autoresponder_autoresponder.tpl
index 3a7b34a1..0a96131d 100644
--- a/templates/Froxlor/customer/email/autoresponder_autoresponder.tpl
+++ b/templates/Froxlor/customer/email/autoresponder_autoresponder.tpl
@@ -6,10 +6,10 @@
 	</td>
 	<td>$activated_date</td>
 	<td>
-		<a href="$filename?&amp;action=edit&amp;email={$row['email']}&amp;s=$s" style="text-decoration:none;">
+		<a href="{$linker->getLink(array('section' => 'autoresponder', 'action' => 'edit', 'email' => $row['email']))}" style="text-decoration:none;">
 			<img src="images/Froxlor/icons/edit.png" alt="{$lng['panel']['edit']}" />
 		</a>&nbsp;
-		<a href="$filename?&amp;action=delete&amp;email={$row['email']}&amp;s=$s" style="text-decoration:none;">
+		<a href="{$linker->getLink(array('section' => 'autoresponder', 'action' => 'delete', 'email' => $row['email']))}" style="text-decoration:none;">
 			<img src="images/Froxlor/icons/delete.png" alt="{$lng['panel']['delete']}" />
 		</a>
 	</td>
diff --git a/templates/Froxlor/customer/email/autoresponder_edit.tpl b/templates/Froxlor/customer/email/autoresponder_edit.tpl
index 4a228590..11cdad6c 100644
--- a/templates/Froxlor/customer/email/autoresponder_edit.tpl
+++ b/templates/Froxlor/customer/email/autoresponder_edit.tpl
@@ -9,7 +9,7 @@ $header
   
 		<section class="fullform bradiusodd">
 
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'autoresponder'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/customer/email/emails.tpl b/templates/Froxlor/customer/email/emails.tpl
index 78ba587c..3dffe63d 100644
--- a/templates/Froxlor/customer/email/emails.tpl
+++ b/templates/Froxlor/customer/email/emails.tpl
@@ -9,7 +9,7 @@
 
 		<section>
 
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 
 			<div class="overviewsearch">
 				{$searchcode}
@@ -18,7 +18,7 @@
 			<if ($userinfo['emails_used'] < $userinfo['emails'] || $userinfo['emails'] == '-1') && 15 < $emails_count && $emaildomains_count !=0 >
 				<div class="overviewadd">
 					<img src="images/Froxlor/icons/email_add.png" alt="" />&nbsp;
-					<a href="$filename?page={$page}&amp;action=add&amp;s=$s">{$lng['emails']['emails_add']}</a>
+					<a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'add'))}">{$lng['emails']['emails_add']}</a>
 				</div>
 			</if>
 
@@ -57,7 +57,7 @@
 			<if ($userinfo['emails_used'] < $userinfo['emails'] || $userinfo['emails'] == '-1') && $emaildomains_count !=0 >
 				<div class="overviewadd">
 					<img src="images/Froxlor/icons/email_add.png" alt="" />&nbsp;
-					<a href="$filename?page={$page}&amp;action=add&amp;s=$s">{$lng['emails']['emails_add']}</a>
+					<a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'add'))}">{$lng['emails']['emails_add']}</a>
 				</div>
 			</if>
 
diff --git a/templates/Froxlor/customer/email/emails_add.tpl b/templates/Froxlor/customer/email/emails_add.tpl
index 2ccddbaf..daad8e26 100644
--- a/templates/Froxlor/customer/email/emails_add.tpl
+++ b/templates/Froxlor/customer/email/emails_add.tpl
@@ -18,7 +18,7 @@ $header
 
 	<section class="fullform bradiusodd">
 
-		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+		<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 			<fieldset>
 				<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/customer/email/emails_edit.tpl b/templates/Froxlor/customer/email/emails_edit.tpl
index 3433e475..060bed46 100644
--- a/templates/Froxlor/customer/email/emails_edit.tpl
+++ b/templates/Froxlor/customer/email/emails_edit.tpl
@@ -9,14 +9,14 @@ $header
 
 	<section class="fullform bradiusodd">
 
-		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+		<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 			<fieldset>
 				<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
 				<table class="formtable">
 					{$email_edit_form}
 					<tr>
-						<td class="maintitle" colspan="2"><a href="$filename?page=emails&amp;s=$s">{$lng['emails']['back_to_overview']}</a></td>
+						<td class="maintitle" colspan="2"><a href="{$linker->getLink(array('section' => 'email', 'page' => 'emails'))}">{$lng['emails']['back_to_overview']}</a></td>
 					</tr>
 				</table>
 			</fieldset>
diff --git a/templates/Froxlor/customer/email/emails_edit_forwarder.tpl b/templates/Froxlor/customer/email/emails_edit_forwarder.tpl
index 181101c5..88467962 100644
--- a/templates/Froxlor/customer/email/emails_edit_forwarder.tpl
+++ b/templates/Froxlor/customer/email/emails_edit_forwarder.tpl
@@ -1,2 +1,2 @@
-$destination [<a href="$filename?page=forwarders&amp;action=delete&amp;id={$id}&amp;forwarderid={$dest_id}&amp;s=$s">{$lng['panel']['delete']}</a>]
+$destination [<a href="{$linker->getLink(array('section' => 'email', 'page' => 'forwarders', 'action' => 'delete', 'id' => $id, 'forwarderid' => $dest_id))}">{$lng['panel']['delete']}</a>]
 <br />
\ No newline at end of file
diff --git a/templates/Froxlor/customer/email/emails_email.tpl b/templates/Froxlor/customer/email/emails_email.tpl
index c78ca272..916a893e 100644
--- a/templates/Froxlor/customer/email/emails_email.tpl
+++ b/templates/Froxlor/customer/email/emails_email.tpl
@@ -5,10 +5,10 @@
 	<td><if $row['iscatchall'] != 0>{$lng['panel']['yes']}</if><if $row['iscatchall'] == 0>{$lng['panel']['no']}</if></td>
 	<if $settings['system']['mail_quota_enabled'] == '1'><td><if $row['quota'] == 0>{$lng['emails']['noquota']}<else>{$row['quota']} MB</if></if></td>
 	<td>
-		<a href="$filename?page={$page}&amp;action=edit&amp;id={$row['id']}&amp;s=$s" style="text-decoration:none;">
+		<a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}" style="text-decoration:none;">
 			<img src="images/Froxlor/icons/edit.png" alt="{$lng['panel']['edit']}" />
 		</a>&nbsp;
-		<a href="$filename?page={$page}&amp;action=delete&amp;id={$row['id']}&amp;s=$s" style="text-decoration:none;">
+		<a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}" style="text-decoration:none;">
 			<img src="images/Froxlor/icons/delete.png" alt="{$lng['panel']['delete']}" />
 		</a>
 	</td>
diff --git a/templates/Froxlor/customer/email/forwarder_add.tpl b/templates/Froxlor/customer/email/forwarder_add.tpl
index a9ec39ed..63385133 100644
--- a/templates/Froxlor/customer/email/forwarder_add.tpl
+++ b/templates/Froxlor/customer/email/forwarder_add.tpl
@@ -9,7 +9,7 @@ $header
 
 	<section class="fullform bradiusodd">
 	
-		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+		<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 			<fieldset>
 				<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>