diff --git a/templates/Classic/customer/index/change_language.tpl b/templates/Classic/customer/index/change_language.tpl
index 45c1becd..92b61b6c 100644
--- a/templates/Classic/customer/index/change_language.tpl
+++ b/templates/Classic/customer/index/change_language.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'index'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
diff --git a/templates/Classic/customer/index/change_password.tpl b/templates/Classic/customer/index/change_password.tpl
index 858dc9d0..377f84ee 100644
--- a/templates/Classic/customer/index/change_password.tpl
+++ b/templates/Classic/customer/index/change_password.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'index'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
diff --git a/templates/Classic/customer/index/change_theme.tpl b/templates/Classic/customer/index/change_theme.tpl
index 0af3f1ea..8f4fa611 100644
--- a/templates/Classic/customer/index/change_theme.tpl
+++ b/templates/Classic/customer/index/change_theme.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'index'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
diff --git a/templates/Froxlor/customer/index/change_language.tpl b/templates/Froxlor/customer/index/change_language.tpl
index 60a0f5fc..fe4d3bf8 100644
--- a/templates/Froxlor/customer/index/change_language.tpl
+++ b/templates/Froxlor/customer/index/change_language.tpl
@@ -8,7 +8,7 @@ $header
 		</header>
 
 		<section class="tinyform bradiusodd">
-			<form method="post" action="$filename" enctype="application/x-www-form-urlencoded">
+			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changelanguage']}</legend>
 				<p>
diff --git a/templates/Froxlor/customer/index/change_password.tpl b/templates/Froxlor/customer/index/change_password.tpl
index 3cc89511..e38c077b 100644
--- a/templates/Froxlor/customer/index/change_password.tpl
+++ b/templates/Froxlor/customer/index/change_password.tpl
@@ -8,7 +8,7 @@ $header
 		</header>
 
 		<section class="tinyform bradiusodd">
-			<form method="post" action="$filename" enctype="application/x-www-form-urlencoded">
+			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<legend>Froxlor&nbsp;-&nbsp{$lng['menue']['main']['changepassword']}</legend>
 				<p>
diff --git a/templates/Froxlor/customer/index/change_theme.tpl b/templates/Froxlor/customer/index/change_theme.tpl
index 908a8f21..78531dde 100644
--- a/templates/Froxlor/customer/index/change_theme.tpl
+++ b/templates/Froxlor/customer/index/change_theme.tpl
@@ -8,7 +8,7 @@ $header
 		</header>
 
 		<section class="tinyform bradiusodd">
-			<form method="post" action="$filename" enctype="application/x-www-form-urlencoded">
+			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changetheme']}</legend>
 				<p>