diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 23c81d606..c1ab3ab60 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -4451,8 +4451,7 @@ class SurveyAdmin
      * @return unknown_type
      *
      */
-    function anketa_delete_from_db($anketa)
-    {
+    function anketa_delete_from_db($anketa){
         global $site_path, $global_user_id;
 
         if (!$anketa) return;
@@ -4464,23 +4463,27 @@ class SurveyAdmin
         unset($_SESSION['query']);
         unset($_SESSION['result']);
 
-        // pošiljanje obvestil ob izbrisu ankete
-        //SurveyAlert::getInstance()->Init($anketa, $global_user_id);
-        //SurveyAlert::getInstance()->sendMailDelete();
 
         $sql = sisplet_query("SELECT id FROM srv_grupa WHERE ank_id = '$anketa'");
         while ($row = mysqli_fetch_array($sql)) {
+
             $sql1 = sisplet_query("SELECT id FROM srv_spremenljivka WHERE gru_id='$row[id]'");
             while ($row1 = mysqli_fetch_array($sql1)) {
                 $sql2 = sisplet_query("DELETE FROM srv_vrednost WHERE spr_id = '$row1[id]'");
             }
+
             $sql2 = sisplet_query("DELETE FROM srv_spremenljivka WHERE gru_id = '$row[id]'");
 
-            # tabela srv_user_grupa
-            $sql2 = sisplet_query("DELETE FROM srv_user_grupa WHERE gru_id = '$row[id]'");
+            # tabela srv_user_grupa_archive1
+            $sql2 = sisplet_query("DELETE FROM srv_user_grupa_archive1 WHERE gru_id = '$row[id]'");
+
+            # tabela srv_user_grupa_archive2
+            $sql2 = sisplet_query("DELETE FROM srv_user_grupa_archive2 WHERE gru_id = '$row[id]'");
+
             # tabela srv_user_grupa_active
             $sql2 = sisplet_query("DELETE FROM srv_user_grupa" . $this->db_table . " WHERE gru_id = '$row[id]'");
         }
+
         $sql2 = sisplet_query("DELETE FROM srv_grupa WHERE ank_id = '$anketa'");
         $sql2 = sisplet_query("DELETE FROM srv_alert WHERE ank_id = '$anketa'");
         $sql2 = sisplet_query("DELETE FROM srv_dostop WHERE ank_id = '$anketa'");
@@ -4493,6 +4496,7 @@ class SurveyAdmin
         $sql2 = sisplet_query("DELETE FROM srv_variable_profiles WHERE sid = '$anketa'");
         $sql2 = sisplet_query("DELETE FROM srv_glasovanje WHERE ank_id = '$anketa'");
         $sql2 = sisplet_query("DELETE FROM srv_survey_misc WHERE sid = '$anketa'");
+        
         # Pobrisemo srv_condition_vre
         $sql2 = sisplet_query("DELETE FROM srv_condition_vre WHERE cond_id IN (SELECT id FROM srv_condition WHERE if_id IN (SELECT element_if FROM srv_branching WHERE ank_id = '$anketa' AND element_if > 0))");
         #Pobrisemo srv_condition_grid