diff --git a/admin/survey/modules/mod_EVOLI/forms/organizational_employeeship_meter_form.php b/admin/survey/modules/mod_EVOLI/forms/organizational_employeeship_meter_form.php
index 43e3d7df6..c2b2423cb 100644
--- a/admin/survey/modules/mod_EVOLI/forms/organizational_employeeship_meter_form.php
+++ b/admin/survey/modules/mod_EVOLI/forms/organizational_employeeship_meter_form.php
@@ -42,7 +42,7 @@
 						dateFormat: "dd.mm.yy",
 						showAnim: "slideDown",
 						showOn: "button",
-						buttonImage: "../../script/calendar/calendar.gif",
+						buttonImage: "../../../script/calendar/calendar.gif",
 						buttonImageOnly: true,
 						buttonText: ""
 					});
@@ -55,7 +55,7 @@
 						dateFormat: "dd.mm.yy",
 						showAnim: "slideDown",
 						showOn: "button",
-						buttonImage: "../../script/calendar/calendar.gif",
+						buttonImage: "../../../script/calendar/calendar.gif",
 						buttonImageOnly: true,
 						buttonText: ""
 					});
diff --git a/admin/survey/modules/mod_EVOLI/forms/quality_climate_form.php b/admin/survey/modules/mod_EVOLI/forms/quality_climate_form.php
index 2e155c586..bb589f9ab 100644
--- a/admin/survey/modules/mod_EVOLI/forms/quality_climate_form.php
+++ b/admin/survey/modules/mod_EVOLI/forms/quality_climate_form.php
@@ -42,7 +42,7 @@
 						dateFormat: "dd.mm.yy",
 						showAnim: "slideDown",
 						showOn: "button",
-						buttonImage: "../../script/calendar/calendar.gif",
+						buttonImage: "../../../script/calendar/calendar.gif",
 						buttonImageOnly: true,
 						buttonText: ""
 					});
@@ -55,7 +55,7 @@
 						dateFormat: "dd.mm.yy",
 						showAnim: "slideDown",
 						showOn: "button",
-						buttonImage: "../../script/calendar/calendar.gif",
+						buttonImage: "../../../script/calendar/calendar.gif",
 						buttonImageOnly: true,
 						buttonText: ""
 					});
diff --git a/admin/survey/modules/mod_EVOLI/forms/team_meter_form.php b/admin/survey/modules/mod_EVOLI/forms/team_meter_form.php
index a9d8de946..d9f5d30de 100644
--- a/admin/survey/modules/mod_EVOLI/forms/team_meter_form.php
+++ b/admin/survey/modules/mod_EVOLI/forms/team_meter_form.php
@@ -42,7 +42,7 @@
 						dateFormat: "dd.mm.yy",
 						showAnim: "slideDown",
 						showOn: "button",
-						buttonImage: "../../script/calendar/calendar.gif",
+						buttonImage: "../../../script/calendar/calendar.gif",
 						buttonImageOnly: true,
 						buttonText: ""
 					});
@@ -55,7 +55,7 @@
 						dateFormat: "dd.mm.yy",
 						showAnim: "slideDown",
 						showOn: "button",
-						buttonImage: "../../script/calendar/calendar.gif",
+						buttonImage: "../../../script/calendar/calendar.gif",
 						buttonImageOnly: true,
 						buttonText: ""
 					});
diff --git a/admin/survey/modules/mod_EVOLI/forms/teamship_meter_form.php b/admin/survey/modules/mod_EVOLI/forms/teamship_meter_form.php
index f5d0668c9..4cc45248b 100644
--- a/admin/survey/modules/mod_EVOLI/forms/teamship_meter_form.php
+++ b/admin/survey/modules/mod_EVOLI/forms/teamship_meter_form.php
@@ -42,7 +42,7 @@
 						dateFormat: "dd.mm.yy",
 						showAnim: "slideDown",
 						showOn: "button",
-						buttonImage: "../../script/calendar/calendar.gif",
+						buttonImage: "../../../script/calendar/calendar.gif",
 						buttonImageOnly: true,
 						buttonText: ""
 					});
@@ -55,7 +55,7 @@
 						dateFormat: "dd.mm.yy",
 						showAnim: "slideDown",
 						showOn: "button",
-						buttonImage: "../../script/calendar/calendar.gif",
+						buttonImage: "../../../script/calendar/calendar.gif",
 						buttonImageOnly: true,
 						buttonText: ""
 					});
diff --git a/main/survey/app/Controllers/JsController.php b/main/survey/app/Controllers/JsController.php
index 7b68473be..790c3855f 100644
--- a/main/survey/app/Controllers/JsController.php
+++ b/main/survey/app/Controllers/JsController.php
@@ -985,11 +985,16 @@ class JsController extends Controller
 
         if($evoli_teammeter){
             echo '              var obj = document.forms[\'vnos\'].elements[\'evoli_tm_department\']; ' . "\n";
-            echo '              if (obj.value == 0) { ' . "\n";
-            echo '                hard = false; ' . "\n";
-            echo '                submitAlert(\'#spremenljivka_evoli_tm_department\', \'add\', \'require\', \'hard\', validation, false, false, false, false); ' . "\n";
-            echo '              } else { ' . "\n";
-            echo '                submitAlert(\'#spremenljivka_evoli_tm_department\', \'remove\', \'require\', \'hard\', validation, false, false, false, false); ' . "\n";
+
+            echo '              if (typeof(obj) != "undefined" && obj != null) { ' . "\n";
+
+            echo '                  if (obj.value == 0) { ' . "\n";
+            echo '                    hard = false; ' . "\n";
+            echo '                    submitAlert(\'#spremenljivka_evoli_tm_department\', \'add\', \'require\', \'hard\', validation, false, false, false, false); ' . "\n";
+            echo '                  } else { ' . "\n";
+            echo '                    submitAlert(\'#spremenljivka_evoli_tm_department\', \'remove\', \'require\', \'hard\', validation, false, false, false, false); ' . "\n";
+            echo '                  } ' . "\n";
+
             echo '              } ' . "\n";
         }