diff --git a/templates/Classic/admin/customers/customers.tpl b/templates/Classic/admin/customers/customers.tpl
index 2109e617..cf79a4ba 100644
--- a/templates/Classic/admin/customers/customers.tpl
+++ b/templates/Classic/admin/customers/customers.tpl
@@ -1,5 +1,5 @@
 $header
-	<form action="$filename" method="post">
+	<form action="{$linker->getLink(array('section' => 'customers'))}" 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['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1') && 15 < $userinfo['customers_used']>
 			<tr>
-				<td colspan="11" class="field_display_border_left"><a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['customer_add']}</a></td>
+				<td colspan="11" class="field_display_border_left"><a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['customer_add']}</a></td>
 			</tr>
 			</if>
 			<tr>
@@ -43,7 +43,7 @@ $header
 			</if>
 			<if $userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1'>
 			<tr>
-				<td colspan="<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >11<else>10</if>" class="field_display_border_left"><a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['customer_add']}</a></td>
+				<td colspan="<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >11<else>10</if>" class="field_display_border_left"><a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['customer_add']}</a></td>
 			</tr>
 			</if>
 		</table>
diff --git a/templates/Classic/admin/customers/customers_add.tpl b/templates/Classic/admin/customers/customers_add.tpl
index bd5ff631..b195443d 100644
--- a/templates/Classic/admin/customers/customers_add.tpl
+++ b/templates/Classic/admin/customers/customers_add.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'customers'))}">
 		<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/admin/customers/customers_customer.tpl b/templates/Classic/admin/customers/customers_customer.tpl
index 421cc374..bc7c17b4 100644
--- a/templates/Classic/admin/customers/customers_customer.tpl
+++ b/templates/Classic/admin/customers/customers_customer.tpl
@@ -1,5 +1,5 @@
 <tr>
-	<td class="field_name_border_left"{$column_style}><a href="$filename?s=$s&amp;page=$page&amp;action=su&amp;id={$row['customerid']}" target="_blank">{$row['loginname']}</a></td>
+	<td class="field_name_border_left"{$column_style}><a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'su', 'id' => $row['customerid']))}" target="_blank">{$row['loginname']}</a></td>
 	<td class="field_name">{$row['adminname']}</td>
 	<td class="field_name"><if $row['name'] != '' && $row['firstname'] != ''>{$row['name']}<br />{$row['firstname']}</if><if ($row['name'] == '' || $row['firstname'] == '') && $row['company'] != ''>{$row['company']}</if></td>
 	<td class="field_name"><if $row['domains'] != 0><a href="admin_domains.php?s=$s&amp;page=domains&amp;searchfield=c.loginname&amp;searchtext={$row['loginname']}">{$row['domains']}</a><else>{$row['domains']}</if></td>
@@ -27,5 +27,5 @@
 	<td class="field_name"><b><font color="green">{$row['emails_used']}</font></b>/<b><font color="#FD6204">{$row['emails']}</font></b><br /><b><font color="green">{$row['subdomains_used']}</font></b>/<b><font color="#FD6204">{$row['subdomains']}</font></b></td>
 	<td class="field_name"><b><font color="green">{$row['email_accounts_used']}</font></b>/<b><font color="#FD6204">{$row['email_accounts']}</font></b><br /><b><font color="green">{$row['email_forwarders_used']}</font></b>/<b><font color="#FD6204">{$row['email_forwarders']}</font></b></td>
 	<td class="field_name" style=" text-align: center; "><if $row['deactivated'] == '1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if><br />{$last_login}</td>
-	<td class="field_name"><a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['customerid']}">{$lng['panel']['edit']}</a><br /><a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['customerid']}">{$lng['panel']['delete']}</a></td>
+	<td class="field_name"><a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'edit', 'id' => $row['customerid']))}">{$lng['panel']['edit']}</a><br /><a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'delete', 'id' => $row['customerid']))}">{$lng['panel']['delete']}</a></td>
 </tr>
diff --git a/templates/Classic/admin/customers/customers_edit.tpl b/templates/Classic/admin/customers/customers_edit.tpl
index 28b63db9..a2b3d3ac 100644
--- a/templates/Classic/admin/customers/customers_edit.tpl
+++ b/templates/Classic/admin/customers/customers_edit.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'customers'))}">
 		<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/admin/customers/customers.tpl b/templates/Froxlor/admin/customers/customers.tpl
index 5db83d97..26f2b2e7 100644
--- a/templates/Froxlor/admin/customers/customers.tpl
+++ b/templates/Froxlor/admin/customers/customers.tpl
@@ -9,7 +9,7 @@ $header
 
 		<section>
 
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'customers'))}" method="post" enctype="application/x-www-form-urlencoded">
 
 			<div class="overviewsearch">
 				{$searchcode}
@@ -18,7 +18,7 @@ $header
 			<if ($userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1') && 15 < $userinfo['customers_used'] >
 				<div class="overviewadd">
 					<img src="images/Froxlor/icons/user_add.png" alt="" />&nbsp;
-					<a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['customer_add']}</a>
+					<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['customer_add']}</a>
 				</div>
 			</if>
 
@@ -34,7 +34,7 @@ $header
 					<th>{$lng['panel']['options']}</th>
 				</tr>
 			</thead>
-			<if $pagingcode != ''>			
+			<if $pagingcode != ''>
 				<tfoot>
 					<tr>
 						<td>{$pagingcode}</td>
@@ -56,7 +56,7 @@ $header
 			<if $userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1'>
 			<div class="overviewadd">
 				<img src="images/Froxlor/icons/user_add.png" alt="" />&nbsp;
-				<a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['customer_add']}</a>
+				<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['customer_add']}</a>
 			</div>
 			</if>
 
diff --git a/templates/Froxlor/admin/customers/customers_add.tpl b/templates/Froxlor/admin/customers/customers_add.tpl
index f8842330..acee1490 100644
--- a/templates/Froxlor/admin/customers/customers_add.tpl
+++ b/templates/Froxlor/admin/customers/customers_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' => 'customers'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/admin/customers/customers_customer.tpl b/templates/Froxlor/admin/customers/customers_customer.tpl
index a62f825c..191d0ede 100644
--- a/templates/Froxlor/admin/customers/customers_customer.tpl
+++ b/templates/Froxlor/admin/customers/customers_customer.tpl
@@ -7,7 +7,7 @@
 		<if ($row['name'] == '' || $row['firstname'] == '') && $row['company'] != ''>
 			{$row['company']}
 		</if>
-		&nbsp;(<a href="$filename?s=$s&amp;page=$page&amp;action=su&amp;id={$row['customerid']}" rel="external">{$row['loginname']}</a> | {$row['adminname']})
+		&nbsp;(<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'su', 'id' => $row['customerid']))}" rel="external">{$row['loginname']}</a> | {$row['adminname']})
 		</strong>
 		<div>
 			<span class="overviewcustomerextras">
@@ -50,10 +50,10 @@
 		</div>
 	</td>
 	<td>
-		<a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['customerid']}" style="text-decoration:none;">
+		<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'edit', 'id' => $row['customerid']))}" style="text-decoration:none;">
 			<img src="images/Froxlor/icons/edit.png" alt="{$lng['panel']['edit']}" />
 		</a>&nbsp;
-		<a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['customerid']}" style="text-decoration:none;">
+		<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'delete', 'id' => $row['customerid']))}" style="text-decoration:none;">
 			<img src="images/Froxlor/icons/delete.png" alt="{$lng['panel']['delete']}" />
 		</a>
 	</td>
diff --git a/templates/Froxlor/admin/customers/customers_edit.tpl b/templates/Froxlor/admin/customers/customers_edit.tpl
index ae4c13b4..f70df89d 100644
--- a/templates/Froxlor/admin/customers/customers_edit.tpl
+++ b/templates/Froxlor/admin/customers/customers_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' => 'customers'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>