diff --git a/cbox-tree.d/usr/share/cryptobox/templates/config_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/config_form.cs
index db508c8..6b6a256 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/config_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/config_form.cs
@@ -1,7 +1,7 @@
 <div id="config">
     <h1><?cs var:Lang.Title.Config ?></h1>
 
-    <form action="<?cs call:getSelfURL() ?>" method="post"
+    <form action="<?cs call:getSelfURL('','') ?>" method="post"
 	    enctype="application/x-www-form-urlencoded">
 
 	<p><label for="ip"><?cs var:Lang.Text.IPAddress ?></label><br/>
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/footer.cs b/cbox-tree.d/usr/share/cryptobox/templates/footer.cs
index 0adc39f..e2a2759 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/footer.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/footer.cs
@@ -11,7 +11,7 @@
   </div>
 </div>
 
-<!-- CBOX-STATUS-begin - necessary for validation - do not touch!
+<!-- CBOX-STATUS-begin - used for validation - do not touch!
 Data.Config.IP=<?cs var:Data.Config.IP ?>
 Data.Config.Language=<?cs var:Data.Config.Language ?>
 Data.Config.TimeOut=<?cs var:Data.Config.TimeOut ?>
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/init_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/init_form.cs
index ec30583..132956c 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/init_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/init_form.cs
@@ -1,7 +1,7 @@
 <h1><?cs var:Lang.Title.Init ?></h1>
 
   <div class="init">
-	<form action="<?cs call:getSelfURL() ?>" method="post" enctype="application/x-www-form-urlencoded">
+	<form action="<?cs call:getSelfURL('','') ?>" method="post" enctype="application/x-www-form-urlencoded">
 
 	    <p class="note"><?cs var:Lang.Text.InitWarning ?></p>
 	    <p><label for="password"><?cs var:Lang.Text.EnterNewPassword ?></label><br/>
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/macros.cs b/cbox-tree.d/usr/share/cryptobox/templates/macros.cs
index 674f719..bc7c69d 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/macros.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/macros.cs
@@ -55,7 +55,7 @@
 #		- 'exclude' is 'weblang'
 #	BEWARE: there is a bug (?) in clearsilver, that occours, if
 #		only one of the arguments is set (none or both are fine)
-?>  set:PostSuffix='' ?><?cs
+?><?cs set:PostSuffix='' ?><?cs
     set:tmp_concat='?' ?><?cs
     each:item = Data.PostData ?><?cs
         if:(name(item) != exclude) ?><?cs
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
index 1d8c928..4d56209 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
@@ -1,7 +1,7 @@
 <h1>Aktivierung des verschl&uuml;sselten Dateisystems</h1>
 
 <div align="center">
-    <form action="<?cs call:getSelfURL() ?>" method="post"
+    <form action="<?cs call:getSelfURL('','') ?>" method="post"
 	    enctype="application/x-www-form-urlencoded">
 
 	<p><label for="passwort">Passwort eingeben:</label>
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs
index 22ecff6..3ae4162 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs
@@ -1,7 +1,7 @@
 <h1><?cs var:Lang.Title.ShutDown ?></h1>
 
 <div align="center">
-    <form action="<?cs call:getSelfURL() ?>" method="post"
+    <form action="<?cs call:getSelfURL('','') ?>" method="post"
 		enctype="application/x-www-form-urlencoded">
 	
 	<input type="hidden" name="action" value="shutdown_do" />
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs
index c43e472..2f8a13a 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs
@@ -1,7 +1,7 @@
 <h1><?cs var:Lang.Title.Umount ?></h1>
 
 <div align="center">
-    <form action="<?cs call:getSelfURL() ?>" method="post"
+    <form action="<?cs call:getSelfURL('','') ?>" method="post"
 		enctype="application/x-www-form-urlencoded">
 
 	<button type="submit" name="action"