diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 080d975fa..60bdd739c 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -2793,11 +2793,13 @@ class SurveyAdminSettings {
                 echo '</p>';
             }
 
-            //respondent iz cms
-            echo '<p><input type="checkbox" name="alert_finish_respondent_cms" id="alert_finish_respondent_cms" value="1" onChange="change_alert_respondent(\'finish_respondent_cms\', $(this)); chnage_alert_instruction($(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . ($rowAlert['finish_respondent_cms'] == 1 ? ' checked' : '') . '>';
-            echo '<span id="label_alert_finish_respondent_cms">';
-            $this->display_alert_label('finish_respondent_cms',($rowAlert['finish_respondent_cms'] == 1));
-            echo '</span></p>'. "\n";
+            // respondent iz cms ne prikazemo ce gre za volitve
+            if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){
+                echo '<p><input type="checkbox" name="alert_finish_respondent_cms" id="alert_finish_respondent_cms" value="1" onChange="change_alert_respondent(\'finish_respondent_cms\', $(this)); chnage_alert_instruction($(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . ($rowAlert['finish_respondent_cms'] == 1 ? ' checked' : '') . '>';
+                echo '<span id="label_alert_finish_respondent_cms">';
+                $this->display_alert_label('finish_respondent_cms',($rowAlert['finish_respondent_cms'] == 1));
+                echo '</span></p>'. "\n";
+            }
 
             // avtor ankete oz osebe z dostopom
             //echo '<p><input type="checkbox" name="alert_finish_author" id="alert_finish_author" value="1" onChange="change_alert_respondent(\'finish_author\', $(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;"' . ($rowAlert['finish_author'] == 1 ? ' checked' : '') . '>';
diff --git a/admin/survey/modules/mod_voting/class.SurveyVoting.php b/admin/survey/modules/mod_voting/class.SurveyVoting.php
index 40c74e9d7..f551dcbdc 100644
--- a/admin/survey/modules/mod_voting/class.SurveyVoting.php
+++ b/admin/survey/modules/mod_voting/class.SurveyVoting.php
@@ -38,7 +38,7 @@ class SurveyVoting{
         sisplet_query("INSERT INTO srv_anketa_module (ank_id, modul) VALUES ('".$this->anketa."', 'email')");
         
         // Ugasnemo obvescanje respondenta
-        sisplet_query("UPDATE srv_alert SET finish_respondent='0' WHERE ank_id='".$this->anketa."'");
+        sisplet_query("UPDATE srv_alert SET finish_respondent='0', finish_respondent_cms='0' WHERE ank_id='".$this->anketa."'");
 	}
     
 	// Nastavitve volitev