diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 16b4ade56..add608a5e 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -1879,45 +1879,21 @@ class SurveyAdminSettings {
 			echo '</div>';
 			
 			echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'.$lang['srv_sledenje_browser'].':</span>';
-			
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_browser" id="survey_browser_1" value="1"'.($browser==1?' checked':'').' '.$voting_disabled.'>';
-            echo '<label for="survey_browser_1">'.$lang['no'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_browser" id="survey_browser_0" value="0"'.($browser==0?' checked':'').' '.$voting_disabled.'>';
-            echo '<label for="survey_browser_0">'.$lang['yes'].'</label>';
-			echo '</div>';
-			
+			echo '<input type="hidden" name="survey_browser" value="1">';
+            echo '<input type="checkbox" id="survey_browser" name="survey_browser" value="0" '.($browser==0? ' checked':'').' '.$voting_disabled.'>';
+            echo '<label for="survey_browser">'. $lang['srv_sledenje_browser'] .'</label> ';
 			echo '</div>';
 
 			echo '<div class="setting_holder">';
-            echo '<span class="setting_title">'.$lang['srv_sledenje_referal'].':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_referal" id="survey_referal_1" value="1"'.($referal==1?' checked':'').' '.$voting_disabled.'>';
-            echo '<label for="survey_referal_1">'.$lang['no'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_referal" id="survey_referal_0" value="0"'.($referal==0?' checked':'').' '.$voting_disabled.'>';
-            echo '<label for="survey_referal_0" >'.$lang['yes'].'</label>';
-			echo '</div>';
-			
+			echo '<input type="hidden" name="survey_referal" value="1">';
+            echo '<input type="checkbox" id="survey_referal" name="survey_referal" value="0" '.($referal==0? ' checked':'').' '.$voting_disabled.'>';
+            echo '<label for="survey_referal">'. $lang['srv_sledenje_referal'] .'</label> ';
 			echo '</div>';
 
 			echo '<div class="setting_holder">';
-            echo '<span class="setting_title">'.$lang['srv_sledenje_date'].':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_date" id="survey_date_1" value="1"'.($date==1?' checked':'').' '.$voting_disabled.'>';
-            echo '<label for="survey_date_1">'.$lang['no'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_date" id="survey_date_0" value="0"'.($date==0?' checked':'').' '.$voting_disabled.'>';
-            echo '<label for="survey_date_0">'.$lang['yes'].'</label>';
-			echo '</div>';
-			
+			echo '<input type="hidden" name="survey_date" value="1">';
+            echo '<input type="checkbox" id="survey_date" name="survey_date" value="0" '.($date==0? ' checked':'').' '.$voting_disabled.'>';
+            echo '<label for="survey_date">'. $lang['srv_sledenje_date'] .'</label> ';
 			echo '</div>';
 
 			echo '</fieldset>';
@@ -1928,17 +1904,9 @@ class SurveyAdminSettings {
 
 			//Shranjuj IP naslov respondenta
 			echo '<div class="setting_holder '.(($ip == 0) ? '' : ' bottom0').'" id="save_IP">';
-			echo '<span class="setting_title">'.$lang['srv_sledenje_ip'].':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_ip" id="survey_ip_1" value="1"'.($ip==1?' checked':'').' '.$voting_disabled.' onClick="toggleParapodatki();">';
-            echo '<label for="survey_ip_1">'.$lang['no'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_ip" id="survey_ip_0" value="0"'.($ip==0?' checked':'').' '.$voting_disabled.' onClick="toggleParapodatki();">';
-            echo '<label for="survey_ip_0">'.$lang['yes'].'</label>';
-			echo '</div>';
-			
+			echo '<input type="hidden" name="survey_ip" value="1">';
+            echo '<input type="checkbox" id="survey_ip" name="survey_ip" value="0" '.($ip==0? ' checked':'').' '.$voting_disabled.' onChange="toggleParapodatki();">';
+            echo '<label for="survey_ip">'. $lang['srv_sledenje_ip'] .'</label> ';
 			echo '</div>';
 
 			echo '<div class=" '.(($ip == 1 && $ip_show == 0) ? 'displayNone' : '').'" id="save_IP_warning">';
@@ -1950,17 +1918,9 @@ class SurveyAdminSettings {
 			echo '<div class="'.(($ip == 0) ? '' : ' displayNone').'" id="connect_IP">';
 
 			echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'.$lang['srv_show_ip'].':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_show_ip" id="survey_show_ip_0" value="0"'.($ip_show==0?' checked':'').' '.$voting_disabled.' onClick="toggleParapodatki();">';
-			echo '<label for="survey_show_ip_0">'.$lang['no'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_show_ip" id="survey_show_ip_1" value="1"'.($ip_show==1?' checked':'').' '.$voting_disabled.' onClick="toggleParapodatki();">';
-			echo '<label for="survey_show_ip_1">'.$lang['yes'].'</label>';
-			echo '</div>';
-			
+			echo '<input type="hidden" name="survey_show_ip" value="0">';
+            echo '<input type="checkbox" id="survey_show_ip" name="survey_show_ip" value="1" '.($ip_show==1? ' checked':'').' '.$voting_disabled.' onChange="toggleParapodatki();">';
+            echo '<label for="survey_show_ip">'. $lang['srv_show_ip'] .'</label> ';
 			echo '</div>';
 
 			echo '<div class=" '.(($ip_show == 1) ? '' : ' displayNone').'" id="connect_IP_warning">';
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 492d849fa..7e93119f1 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -5530,13 +5530,13 @@ function toggleParapodatki(){
 
 	if(survey_ip == '0') {
         $("#save_IP_warning").removeClass('displayNone');
-        $("#save_IP").removeClass('no_margin');
+        $("#save_IP").removeClass('bottom0');
         $("#connect_IP").removeClass('displayNone');
 	}
 
 	else {
         $("#save_IP_warning").addClass('displayNone');
-        $("#save_IP").addClass('no_margin');
+        $("#save_IP").addClass('bottom0');
         $("#connect_IP").addClass('displayNone');
 	}