diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 5d4e29d75..fcf743f6b 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -1393,20 +1393,33 @@ class SurveyAdminSettings {
 			$referal = SurveySetting::getInstance()->getSurveyMiscSetting('survey_referal');
 			$date = SurveySetting::getInstance()->getSurveyMiscSetting('survey_date');
 
-            // Preverimo ce je vklopljen modul za volitve - potem ne pustimo nobenih preklopov
-            $voting_disabled = '';
-            if(SurveyInfo::getInstance()->checkSurveyModule('voting')){
-                $voting_disabled = ' disabled';
-            }
 
 			echo '<fieldset class="wide">';
 			echo '<legend>'.$lang['srv_sledenje'].'</legend>';
 				
+            // Preverimo ce je vklopljen modul za volitve - potem ne pustimo nobenih preklopov
+            $voting_disabled = '';
+            $voting_disabled_class = '';
+            if(SurveyInfo::getInstance()->checkSurveyModule('voting')){
+                $voting_disabled = ' disabled';
+                $voting_disabled_class = ' class="gray"';
+
+                echo '<p class="red">'.$lang['srv_voting_warning_paradata'].'</p>';	
+            }
+			
 			echo '<p>'.$lang['srv_metadata_desc'].'</p>';	
 				
-			echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_sledenje_browser'].':</label></span> <label for="survey_browser_1"><input type="radio" name="survey_browser" id="survey_browser_1" value="1"'.($browser==1?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label> <label for="survey_browser_0"><input type="radio" name="survey_browser" id="survey_browser_0" value="0"'.($browser==0?' checked':'').'>'.$lang['yes'].'</label><br class="clr"/>';
-			echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_sledenje_referal'].':</label></span> <label for="survey_referal_1"><input type="radio" name="survey_referal" id="survey_referal_1" value="1"'.($referal==1?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label> <label for="survey_referal_0"><input type="radio" name="survey_referal" id="survey_referal_0" value="0"'.($referal==0?' checked':'').'>'.$lang['yes'].'</label><br class="clr"/>';
-			echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_sledenje_date'].':</label></span> <label for="survey_date_1"><input type="radio" name="survey_date" id="survey_date_1" value="1"'.($date==1?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label> <label for="survey_date_0"><input type="radio" name="survey_date" id="survey_date_0" value="0"'.($date==0?' checked':'').'>'.$lang['yes'].'</label><br class="clr"/>';
+			echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_sledenje_browser'].':</label></span>';
+            echo ' <label for="survey_browser_1" '.$voting_disabled_class.'><input type="radio" name="survey_browser" id="survey_browser_1" value="1"'.($browser==1?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label>';
+            echo ' <label for="survey_browser_0" '.$voting_disabled_class.'><input type="radio" name="survey_browser" id="survey_browser_0" value="0"'.($browser==0?' checked':'').' '.$voting_disabled.'>'.$lang['yes'].'</label><br class="clr"/>';
+			
+            echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_sledenje_referal'].':</label></span>';
+            echo ' <label for="survey_referal_1" '.$voting_disabled_class.'><input type="radio" name="survey_referal" id="survey_referal_1" value="1"'.($referal==1?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label>';
+            echo ' <label for="survey_referal_0" '.$voting_disabled_class.'><input type="radio" name="survey_referal" id="survey_referal_0" value="0"'.($referal==0?' checked':'').' '.$voting_disabled.'>'.$lang['yes'].'</label><br class="clr"/>';
+			
+            echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_sledenje_date'].':</label></span>';
+            echo ' <label for="survey_date_1" '.$voting_disabled_class.'><input type="radio" name="survey_date" id="survey_date_1" value="1"'.($date==1?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label>';
+            echo ' <label for="survey_date_0" '.$voting_disabled_class.'><input type="radio" name="survey_date" id="survey_date_0" value="0"'.($date==0?' checked':'').' '.$voting_disabled.'>'.$lang['yes'].'</label><br class="clr"/>';
 	
 			echo '</fieldset>';
 	
@@ -1415,17 +1428,24 @@ class SurveyAdminSettings {
 	
 	
 			echo '<fieldset>';
+
 			echo '<legend>'.$lang['srv_sledenje_ip_title'].'</legend>';
 			
-			echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_sledenje_ip'].':</label></span> <label for="survey_ip_1"><input type="radio" name="survey_ip" id="survey_ip_1" value="1"'.($ip==1?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label> <label for="survey_ip_0"><input type="radio" name="survey_ip" id="survey_ip_0" value="0"'.($ip==0?' checked':'').'>'.$lang['yes'].'</label>';
-			if($ip == 0 && $ip_show != 1)
+			echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_sledenje_ip'].':</label></span>';
+            echo ' <label for="survey_ip_1" '.$voting_disabled_class.'><input type="radio" name="survey_ip" id="survey_ip_1" value="1"'.($ip==1?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label>';
+            echo ' <label for="survey_ip_0" '.$voting_disabled_class.'><input type="radio" name="survey_ip" id="survey_ip_0" value="0"'.($ip==0?' checked':'').' '.$voting_disabled.'>'.$lang['yes'].'</label>';
+			
+            if($ip == 0 && $ip_show != 1)
 				echo '<div class="spaceLeft floatRight red" style="display:inline; width:520px;">'.$lang['srv_sledenje_ip_alert'].'</div>';
 				
 			echo '<br class="clr"/>';
 			
 			if($ip == 0 && ($admin_type == 0 || $admin_type == 1)){
-				echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_show_ip'].':</label></span> <label for="survey_show_ip_0"><input type="radio" name="survey_show_ip" id="survey_show_ip_0" value="0"'.($ip_show==0?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label> <label for="survey_show_ip_1"><input type="radio" name="survey_show_ip" id="survey_show_ip_1" value="1"'.($ip_show==1?' checked':'').'>'.$lang['yes'].'</label>';
-				if($ip_show == 1)
+				echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_show_ip'].':</label></span>';
+                echo ' <label for="survey_show_ip_0" '.$voting_disabled_class.'><input type="radio" name="survey_show_ip" id="survey_show_ip_0" value="0"'.($ip_show==0?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label>';
+                echo ' <label for="survey_show_ip_1" '.$voting_disabled_class.'><input type="radio" name="survey_show_ip" id="survey_show_ip_1" value="1"'.($ip_show==1?' checked':'').' '.$voting_disabled.'>'.$lang['yes'].'</label>';
+				
+                if($ip_show == 1)
 					echo '<div class="spaceLeft floatRight red" style="display:inline; width:520px;">'.$lang['srv_show_ip_alert'].'</div>';
 			}
 	
@@ -1438,9 +1458,12 @@ class SurveyAdminSettings {
 				echo '<fieldset class="wide">';
 				echo '<legend>'.$lang['srv_sledenje_identifikatorji_title'].' '.Help::display('srv_email_with_data').'</legend>';
 				
-				echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_sledenje_identifikatorji'].':</label></span> <label for="show_email_0"><input type="radio" name="show_email" id="show_email_0" value="0"'.($row['show_email']==0?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label> <label for="show_email_1"><input type="radio" name="show_email" id="show_email_1" value="1"'.($row['show_email']==1?' checked':'').'>'.$lang['yes'].'</label>';
-				if($row['show_email'] == 1)
-						echo '<div class="spaceLeft floatRight red" style="display:inline; width:520px;">'.$lang['srv_show_mail_with_data3'].'</div>';
+				echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_sledenje_identifikatorji'].':</label></span>';
+                echo ' <label for="show_email_0" '.$voting_disabled_class.'><input type="radio" name="show_email" id="show_email_0" value="0"'.($row['show_email']==0?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label>';
+                echo ' <label for="show_email_1" '.$voting_disabled_class.'><input type="radio" name="show_email" id="show_email_1" value="1"'.($row['show_email']==1?' checked':'').' '.$voting_disabled.'>'.$lang['yes'].'</label>';
+				
+                if($row['show_email'] == 1)
+					echo '<div class="spaceLeft floatRight red" style="display:inline; width:520px;">'.$lang['srv_show_mail_with_data3'].'</div>';
 					
 				echo '</fieldset>';
 			}
diff --git a/lang/1.php b/lang/1.php
index c66a69cdf..0cc2ea1f0 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -3116,6 +3116,7 @@ $lang = array (
 	"srv_voting_invitations1"    	=>	"Prejemnike vabil in sporočilo za vabilo k volitvam urejate v",
 	"srv_voting_invitations2"    	=>	"vmesniku za pošiljanje vabil",
 	"srv_voting_warning"	  		=>	"Vabila so individualizirana zgolj za namen pošiljanja vabil. Nastavitev vabil ni mogoče spreminjati.<br>Ko so vabila poslana, povezovanje med elektronskim naslovom in odgovori respondenta ni mogoče.",
+	"srv_voting_warning_paradata"   =>	"Ker ste pošiljali vabila v anketi z vklopljenim modulom Volitve, teh nastavitev ne morete več spreminjati.",
 	"srv_advanced_paradata"			=>	"Napredni parapodatki",
 	"srv_advanced_paradata_collect_post_time"	=>	"Beleži \"post time\"",
 	"srv_json_survey_export"			=>	"JSON izvoz ankete",
diff --git a/lang/2.php b/lang/2.php
index 3c9d9c3a7..433d21dab 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -3081,13 +3081,14 @@ $lang = array (
 	"srv_kviz_interpretacije"		=>	"Different interpretations",
 	"srv_zakljucek_vprasalnika"		=>	"Survey end",
 	"srv_kviz_konec_note"			=>	"If no option is selected, only administrator can view results",
-    "srv_voting"	        		=>	"Voting",
-    "srv_voting_info"	            =>	"The voting module allows you to send invitations by turning off all paraadata and without any possibility of associating data with e-mail addresses and other identifiers.<br>After switching on, switching off the module is no longer possible!",
+    "srv_voting"	        		=>	"Election",
+    "srv_voting_info"	            =>	"The election module allows you to send invitations by turning off all paraadata and without any possibility of associating data with e-mail addresses and other identifiers.<br>After switching on, switching off the module is no longer possible!",
     "srv_voting_edit1"	    		=>	"You can edit the questionnaire in a tab",
 	"srv_voting_edit2"	    		=>	"Edit",
 	"srv_voting_invitations1"    	=>	"Email invitations are edited in",
 	"srv_voting_invitations2"    	=>	"Email invitations interface",
 	"srv_voting_warning"	  		=>	"Invitations are individualized for the purpose of sending invitations only. Invitation settings cannot be changed.<br> Once the invitations are sent, the link between the e-mail address and the respondent's answers is not possible.",
+    "srv_voting_warning_paradata"   =>	"Because you sent email invitations with the Elections module turned on, you can no longer change these settings.",
     "srv_advanced_paradata"			=>	"Advanced paradata",
     "srv_advanced_paradata_collect_post_time"	=>	"Collect \"post time\"",
 	"srv_json_survey_export"			=>	"JSON survey export",