diff --git a/admin/survey/modules/mod_EVOLI/class.EvoliForm.php b/admin/survey/modules/mod_EVOLI/class.EvoliForm.php
index da6fe14b7..1d8d751d9 100644
--- a/admin/survey/modules/mod_EVOLI/class.EvoliForm.php
+++ b/admin/survey/modules/mod_EVOLI/class.EvoliForm.php
@@ -118,8 +118,8 @@ class EvoliForm {
 	// Prikazemo formo za vnos
 	public function displayForm(){
 		global $lang;
-		
-		echo '<form method="post" action="team_meter.php">';
+
+		echo '<form method="post" action="'.$this->type.'.php">';
 		
 		// Hidden ank_id in email
 		echo '<input type="hidden" name="pass" value="'.$this->pass.'">';
diff --git a/admin/survey/modules/mod_EVOLI/organizational_employeeship_meter.php b/admin/survey/modules/mod_EVOLI/organizational_employeeship_meter.php
index 0a1107396..2c79b7ea9 100644
--- a/admin/survey/modules/mod_EVOLI/organizational_employeeship_meter.php
+++ b/admin/survey/modules/mod_EVOLI/organizational_employeeship_meter.php
@@ -83,9 +83,9 @@
     echo '  <img src="css/logo.png" />';
 
     echo '  <div class="title_text">';
-    if($_GET['language'] == 'slo')
+    if($_GET['language'] == 'slo' || $_POST['language'] == 'slo')
         echo 'Organizacijski Employeeship merilec';
-    elseif($_GET['language'] == 'den')
+    elseif($_GET['language'] == 'den' || $_POST['language'] == 'den')
         echo 'Virksomhedens Employeeship måler';
     else
         echo 'Organisational Employeeship Meter';
diff --git a/admin/survey/modules/mod_EVOLI/quality_climate.php b/admin/survey/modules/mod_EVOLI/quality_climate.php
index 3fa2aca29..3bde62ae4 100644
--- a/admin/survey/modules/mod_EVOLI/quality_climate.php
+++ b/admin/survey/modules/mod_EVOLI/quality_climate.php
@@ -83,9 +83,9 @@
     echo '  <img src="css/logo.png" />';
 
     echo '  <div class="title_text">';
-    if($_GET['language'] == 'slo')
+    if($_GET['language'] == 'slo' || $_POST['language'] == 'slo')
         echo 'Klima Kakovosti';
-    elseif($_GET['language'] == 'den')
+    elseif($_GET['language'] == 'den' || $_POST['language'] == 'den')
         echo 'Kvalitetsklima';
     else
         echo 'Quality Climate';
diff --git a/admin/survey/modules/mod_EVOLI/team_meter.php b/admin/survey/modules/mod_EVOLI/team_meter.php
index c2f151a10..3b3a7b0e4 100644
--- a/admin/survey/modules/mod_EVOLI/team_meter.php
+++ b/admin/survey/modules/mod_EVOLI/team_meter.php
@@ -83,9 +83,9 @@
     echo '  <img src="css/logo.png" />';
 
     echo '  <div class="title_text">';
-    if($_GET['language'] == 'slo')
+    if($_GET['language'] == 'slo' || $_POST['language'] == 'slo')
         echo 'Team Energy Meter';
-    elseif($_GET['language'] == 'den')
+    elseif($_GET['language'] == 'den' || $_POST['language'] == 'den')
         echo 'Team Energy Meter';
     else
         echo 'Team Energy Meter';
diff --git a/admin/survey/modules/mod_EVOLI/teamship_meter.php b/admin/survey/modules/mod_EVOLI/teamship_meter.php
index 514954b92..d9d1bcdb9 100644
--- a/admin/survey/modules/mod_EVOLI/teamship_meter.php
+++ b/admin/survey/modules/mod_EVOLI/teamship_meter.php
@@ -74,7 +74,7 @@
     
     
     $evoli = new EvoliForm();
-    $evoli->setReportType($type='teamteamship_meter_meter');
+    $evoli->setReportType($type='teamteamship_meter');
     
     
 	// Glava
@@ -83,9 +83,9 @@
     echo '  <img src="css/logo.png" />';
 
     echo '  <div class="title_text">';
-    if($_GET['language'] == 'slo')
+    if($_GET['language'] == 'slo' || $_POST['language'] == 'slo')
         echo 'Teamship merilec';
-    elseif($_GET['language'] == 'den')
+    elseif($_GET['language'] == 'den' || $_POST['language'] == 'den')
         echo 'Teamshipmåler';
     else
         echo 'Teamship Meter';