diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 08a124a8a..721314475 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -645,7 +645,7 @@ class SurveyAdminSettings {
 			echo '</div>';
             
             // Ce je zakljucil lahko naknadno ureja svoje odgovore
-			echo '<div class="setting_holder indent no-cookie no-cookie-return">';
+			echo '<div class="setting_holder bottom16 indent no-cookie no-cookie-return">';
             echo '<span class="setting_title" >' . $lang['srv_return_finished'] . Help :: display('srv_return_finished') . ':</span>';
 
 			echo '<div class="setting_item">';
@@ -657,21 +657,6 @@ class SurveyAdminSettings {
             echo '<label for="return_finished_0">' . $lang['srv_return_finished_no'] . '</label>';
 			echo '</div>';
 			
-			echo '</div>';
-
-			// Ce ni sprejel piskotka lahko/ne more nadaljevati
-			echo '<div class="setting_holder bottom16 indent no-cookie">';
-            echo '<span class="setting title">' . $lang['srv_cookie_continue'] . Help :: display('srv_cookie_continue') . ':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="cookie_continue" value="1" id="cookie_continue_1"' . ($row['cookie_continue'] == 1 ? ' checked="checked"' : '') . ' />';
-            echo '<label for="cookie_continue_1">' . $lang['srv_cookie_continue_yes'] . '</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="cookie_continue" value="0" id="cookie_continue_0"' . ($row['cookie_continue'] == 0 ? ' checked="checked"' : '') . ' />';
-            echo '<label for="cookie_continue_0">' . $lang['srv_cookie_continue_no'] . '</label>';
-			echo '</div>';
-			
 			echo '</div>';
 			
 			echo '</div>';
diff --git a/main/survey/app/Controllers/BodyController.php b/main/survey/app/Controllers/BodyController.php
index 26f94ce13..f9bdd71ca 100644
--- a/main/survey/app/Controllers/BodyController.php
+++ b/main/survey/app/Controllers/BodyController.php
@@ -2041,8 +2041,12 @@ class BodyController extends Controller
                 echo '<a href="'.$link.'" target="_blank">' . self::$lang['srv_no_anketa'] . ' </a>';
 
                 // Piskotki
-                if ($row['cookie'] == -1)
+                if ($row['cookie'] == -1){
                     $privacy_text .= '<a href="'.$link_cookie.'" target="_blank">' . self::$lang['srv_no_cookie'] . '</a>, ';
+                }
+                else{
+                    //$privacy_text .= '<a href="'.$link_cookie.'" target="_blank">' . self::$lang['srv_no_cookie'] . '</a>, ';
+                }
 
                 // IP sledenje
                 if ($survey_ip == 1)