diff --git a/templates/Classic/customer/mysql/mysqls.tpl b/templates/Classic/customer/mysql/mysqls.tpl
index fdb2b302..a4ccef7d 100644
--- a/templates/Classic/customer/mysql/mysqls.tpl
+++ b/templates/Classic/customer/mysql/mysqls.tpl
@@ -1,5 +1,5 @@
 $header
-	<form action="$filename" method="post">
+	<form action="{$linker->getLink(array('section' => 'mysql'))}" 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['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') && 15 < $mysqls_count >
 			<tr>
-				<td class="field_display_border_left" colspan="5"><a href="$filename?page=mysqls&amp;action=add&amp;s=$s">{$lng['mysql']['database_create']}</a></td>
+				<td class="field_display_border_left" colspan="5"><a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'add'))}">{$lng['mysql']['database_create']}</a></td>
 			</tr>
 			</if>
 			<tr>
@@ -26,7 +26,7 @@ $header
 			</if>
 			<if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') >
 			<tr>
-				<td class="field_display_border_left" colspan="5"><a href="$filename?page=mysqls&amp;action=add&amp;s=$s">{$lng['mysql']['database_create']}</a></td>
+				<td class="field_display_border_left" colspan="5"><a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'add'))}">{$lng['mysql']['database_create']}</a></td>
 			</tr>
 			</if>
 		</table>
diff --git a/templates/Classic/customer/mysql/mysqls_add.tpl b/templates/Classic/customer/mysql/mysqls_add.tpl
index 70626afa..a53b3522 100644
--- a/templates/Classic/customer/mysql/mysqls_add.tpl
+++ b/templates/Classic/customer/mysql/mysqls_add.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'mysql'))}">
 		<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/mysql/mysqls_database.tpl b/templates/Classic/customer/mysql/mysqls_database.tpl
index 1edd170d..b44efdac 100644
--- a/templates/Classic/customer/mysql/mysqls_database.tpl
+++ b/templates/Classic/customer/mysql/mysqls_database.tpl
@@ -3,8 +3,8 @@
 	<td class="field_name">{$row['description']}</td>
 	<if 1 < count($sql_root)><td class="field_name">{$sql_root[$row['dbserver']]['caption']}</td></if>
 	<if $row['apsdb'] != '1'>
-		<td class="field_name"><a href="$filename?page=mysqls&amp;action=edit&amp;id={$row['id']}&amp;s=$s">{$lng['panel']['edit']}</a></td>
-		<td class="field_name"><a href="$filename?page=mysqls&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' => 'mysql', 'page' => 'mysqls', 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></td>
+		<td class="field_name"><a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a></td>
 	<else>
 		<td class="field_name" colspan="2">{$lng['aps']['cannoteditordeleteapsdb']}</td>
 	</if>
diff --git a/templates/Classic/customer/mysql/mysqls_edit.tpl b/templates/Classic/customer/mysql/mysqls_edit.tpl
index f1723c9d..ba0c9bc0 100644
--- a/templates/Classic/customer/mysql/mysqls_edit.tpl
+++ b/templates/Classic/customer/mysql/mysqls_edit.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'mysql'))}">
 		<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/mysql/mysqls.tpl b/templates/Froxlor/customer/mysql/mysqls.tpl
index 54641b9e..a84844cd 100644
--- a/templates/Froxlor/customer/mysql/mysqls.tpl
+++ b/templates/Froxlor/customer/mysql/mysqls.tpl
@@ -9,7 +9,7 @@
 
 		<section>
 
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'mysql'))}" method="post" enctype="application/x-www-form-urlencoded">
 
 			<div class="overviewsearch">
 				{$searchcode}
@@ -18,7 +18,7 @@
 			<if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') && 15 < $mysqls_count >
 				<div class="overviewadd">
 					<img src="images/Froxlor/icons/mysql_add.png" alt="" />&nbsp;
-					<a href="$filename?page=mysqls&amp;action=add&amp;s=$s">{$lng['mysql']['database_create']}</a>
+					<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'add'))}">{$lng['mysql']['database_create']}</a>
 				</div>
 			</if>
 
@@ -53,7 +53,7 @@
 			<if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') >
 				<div class="overviewadd">
 					<img src="images/Froxlor/icons/mysql_add.png" alt="" />&nbsp;
-					<a href="$filename?page=mysqls&amp;action=add&amp;s=$s">{$lng['mysql']['database_create']}</a>
+					<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'add'))}">{$lng['mysql']['database_create']}</a>
 				</div>
 			</if>
 
diff --git a/templates/Froxlor/customer/mysql/mysqls_add.tpl b/templates/Froxlor/customer/mysql/mysqls_add.tpl
index 66a56345..27d1e621 100644
--- a/templates/Froxlor/customer/mysql/mysqls_add.tpl
+++ b/templates/Froxlor/customer/mysql/mysqls_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' => 'mysql'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/customer/mysql/mysqls_database.tpl b/templates/Froxlor/customer/mysql/mysqls_database.tpl
index f220f128..5da5aed2 100644
--- a/templates/Froxlor/customer/mysql/mysqls_database.tpl
+++ b/templates/Froxlor/customer/mysql/mysqls_database.tpl
@@ -4,10 +4,10 @@
 	<if 1 < count($sql_root)><td>{$sql_root[$row['dbserver']]['caption']}</td></if>
 	<if $row['apsdb'] != '1'>
 		<td>
-			<a href="$filename?page=mysqls&amp;action=edit&amp;id={$row['id']}&amp;s=$s" style="text-decoration:none;">
+			<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', '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=mysqls&amp;action=delete&amp;id={$row['id']}&amp;s=$s" style="text-decoration:none;">
+			<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', '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/mysql/mysqls_edit.tpl b/templates/Froxlor/customer/mysql/mysqls_edit.tpl
index a5426538..5420e963 100644
--- a/templates/Froxlor/customer/mysql/mysqls_edit.tpl
+++ b/templates/Froxlor/customer/mysql/mysqls_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' => 'mysql'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>