diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 5642bed3a..d353a8555 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -582,7 +582,6 @@ class SurveyAdminSettings {
             echo '<h2>'.$lang['srv_cookie_alert_title'].'</h2>';
             echo '<p>'.$lang['srv_cookie_alert_1'].'</p>';
             echo '<p>'.$lang['srv_cookie_alert_2'].'</p>';
-            echo '<p>'.$lang['srv_cookie_alert'].'</p>';
             echo '</div>';
             
             echo '<legend>' . $lang['srv_cookie'] . '</legend>';
diff --git a/main/survey/app/Controllers/AjaxController.php b/main/survey/app/Controllers/AjaxController.php
index 96a45c77b..783ca3093 100644
--- a/main/survey/app/Controllers/AjaxController.php
+++ b/main/survey/app/Controllers/AjaxController.php
@@ -491,14 +491,6 @@ class AjaxController extends Controller
 		}
     }
 
-    // respondent se strinja z uporabo piskotvkov - nastavimo piskotek ok
-    public function ajax_cookie_ok()
-    {
-
-        setcookie('cookie_ok', '1', time() + 2500000, '/');
-
-    }
-
     //izpis statistike glede na spol
     public function ajax_glasovanje_spol()
     {
diff --git a/main/survey/app/Controllers/BodyController.php b/main/survey/app/Controllers/BodyController.php
index 7ccae0360..4117132ed 100644
--- a/main/survey/app/Controllers/BodyController.php
+++ b/main/survey/app/Controllers/BodyController.php
@@ -343,14 +343,11 @@ class BodyController extends Controller
 			
 			// JS na submitu prve strani - lahko da preverjamo privacy ali sprejetje cookija
 			$survey_privacy = SurveySetting::getInstance()->getSurveyMiscSetting('survey_privacy');
-			if(($row['cookie_continue'] == 0 && $row['cookie'] != -1) || $survey_privacy == 2){
+			if($survey_privacy == 2){
 				$js_submit = ' onclick="';				
                 
                 if($survey_privacy == 2)
-					$js_submit .= 'privacy_check();';
-                
-                if($row['cookie_continue'] == 0 && $row['cookie'] != -1)
-					$js_submit .= 'cookie_check();';				
+					$js_submit .= 'privacy_check();';		
                 
                 $js_submit .= 'return false;"';
 			}
@@ -669,14 +666,12 @@ class BodyController extends Controller
 
         if (!get('printPreview')) {
 			
-			// JS na submitu prve strani - lahko da preverjamo privacy ali sprejetje cookija
+			// JS na submitu prve strani - lahko da preverjamo privacy
 			$survey_privacy = SurveySetting::getInstance()->getSurveyMiscSetting('survey_privacy');
-			if(($row['cookie_continue'] == 0 && $row['cookie'] != -1) || $survey_privacy == 2){
-				$js_submit = ' onclick="';				
+			if($survey_privacy == 2){
+				$js_submit = ' onclick="';		
 				if($survey_privacy == 2)
-					$js_submit .= 'privacy_check();';
-				if($row['cookie_continue'] == 0 && $row['cookie'] != -1)
-					$js_submit .= 'cookie_check();';				
+					$js_submit .= 'privacy_check();';		
 				$js_submit .= 'return false;"';
 			}
 			else{
@@ -2477,26 +2472,8 @@ class BodyController extends Controller
 
         save('cookie_expire', $row['cookie']);
 
-        // alert za shranjevanje cookiejev
-        if (get('cookie_expire') != -1 && !(isset($_COOKIE['cookie_ok']) && $_COOKIE['cookie_ok'] == 1) && !empty($row)) {
-
-            echo '<div id="cookie_alert">';
-			if($mysql_database_name == 'vprasalnikirsrssi')
-				echo self::$lang['srv_cookie_ok_rsrs'];
-			else
-				echo self::$lang['srv_cookie_ok'];
-            echo '</div>';
-
-            ?><script>
-                $(function () {
-                    $('#cookie_alert').slideDown();
-                });
-                $('#cookie_ok').on('click', cookie_ok);
-            </script><?
-        }
-
         // alert da je testna anketa
-        if ((get('cookie_expire') == -1 || (isset($_COOKIE['cookie_ok']) && $_COOKIE['cookie_ok'] == 1)) && isset($_GET['testdata']) && $_GET['testdata'] == 'on') {
+        if (isset($_GET['testdata']) && $_GET['testdata'] == 'on') {
 
             echo '<div id="test_alert">';
             echo self::$lang['srv_test_alert'];
@@ -2509,7 +2486,7 @@ class BodyController extends Controller
             </script><?
         } 
         // alert da je predogled
-        elseif ((get('cookie_expire') == -1 || (isset($_COOKIE['cookie_ok']) && $_COOKIE['cookie_ok'] == 1)) && isset($_GET['preview']) && $_GET['preview'] == 'on') {
+        elseif (isset($_GET['preview']) && $_GET['preview'] == 'on') {
            
             echo '<div id="test_alert">';
             echo self::$lang['srv_preview_alert'];
diff --git a/main/survey/app/Controllers/InitClass.php b/main/survey/app/Controllers/InitClass.php
index fa43549c4..27764afbe 100644
--- a/main/survey/app/Controllers/InitClass.php
+++ b/main/survey/app/Controllers/InitClass.php
@@ -173,15 +173,18 @@ class InitClass extends Controller
 
             if ($row['cookie'] == 0) {
                 $this->expire = 0;
-            } elseif ($row['cookie'] == -1) {
+            } 
+            elseif ($row['cookie'] == -1) {
                 if ($rowa['user_from_cms'] == 1) {
                     $this->expire = time() - 3600;
                 } else {
                     $this->expire = 0;
                 }
-            } elseif ($row['cookie'] == 1) {
+            } 
+            elseif ($row['cookie'] == 1) {
                 $this->expire = time() + 3600;
-            } else {
+            } 
+            else {
                 $this->expire = time() + 2500000;
             }
 
@@ -1256,16 +1259,14 @@ class InitClass extends Controller
      */
     protected $anketa, $rand, $expire;
 
-    private function set_cookie($anketa, $rand, $expire)
-    {
+    private function set_cookie($anketa, $rand, $expire){
 
-        $cookie_ok = isset($_COOKIE['cookie_ok']) ? $_COOKIE['cookie_ok'] : '';
-
-        // ce je nastavljeno na brez piskotka ali se ni potrdil shranjevanja piskotkov
-        if (get('cookie_expire') == -1 or $cookie_ok != 1) {                        // cookie prenasamo preko URLja
+        // ce je nastavljeno na brez piskotka
+        if (get('cookie_expire') == -1) {                        // cookie prenasamo preko URLja
             save('cookie_url', '&' . $anketa . '=' . $rand);            // ta string se bo dodal vsem URLjem na konec
             // &amp; dodamo naknadno samo tam, kjer se pise v html (v header() more bit samo &)
-        } else {
+        } 
+        else {
             setcookie($anketa, $rand, $expire);                    // ce je cookie, ga obicajno nastavimo
         }
     }
diff --git a/main/survey/js/script.js b/main/survey/js/script.js
index ecb220203..31292a063 100644
--- a/main/survey/js/script.js
+++ b/main/survey/js/script.js
@@ -1331,26 +1331,6 @@ function init_comments_save () {
 	}();
 }
 
-// respondent se strinja z uporabo piskotkov
-function cookie_ok () {
-	
-	$.post(srv_site_url+'main/survey/ajax.php?a=cookie_ok', {anketa: srv_meta_anketa_id}, function (data) {
-		window.location.reload();
-	});	
-	
-	return false;
-}
-
-function cookie_check() {
-	
-	if ( $('#cookie_alert').css('display') == 'block' ) {
-		alert(lang['srv_cookie_continue_alert']);
-		return false;
-	}
-	
-	$('#container form').submit();
-}
-
 function privacy_check() {
 	
 	if ( $('#privacy_box').length ) {