diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index 2be68cca74..d22bd5b1e8 100644
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -242,7 +242,7 @@ function get_work_count_by_student($user_id, $work_id)
                 c_id = $course_id AND
                 parent_id = $work_id AND
                 user_id = $user_id AND
-                active = 1 AND
+                active IN (0, 1) AND
                 session_id = $session_id ";
 	$result = Database::query($sql);
 	$return = 0;
@@ -313,7 +313,13 @@ function getWorkList($id, $my_folder_data, $add_in_where_query = null)
     if ($is_allowed_to_edit) {
         $active_condition = ' active IN (0, 1)';
         $sql = "SELECT *  FROM  $work_table
-                WHERE c_id = $course_id $add_in_where_query $condition_session AND $active_condition AND (parent_id = 0) $contains_file_query ";
+                WHERE
+                  c_id = $course_id
+                  $add_in_where_query
+                  $condition_session AND
+                  $active_condition AND
+                  (parent_id = 0)
+                  $contains_file_query ";
         if (!empty($group_id)) {
             $sql .= " AND post_group_id = '".$group_id."' ";
         }
@@ -328,9 +334,13 @@ function getWorkList($id, $my_folder_data, $add_in_where_query = null)
             $subdirs_query = "AND parent_id = 0";
         }
         //@todo how we can active or not an assignment?
-        $active_condition = ' AND active IN (1,0)';
+        $active_condition = ' AND active IN (1, 0)';
         $sql = "SELECT * FROM  $work_table
-                $group_query $subdirs_query $add_in_where_query $active_condition $condition_session
+                $group_query
+                $subdirs_query
+                $add_in_where_query
+                $active_condition
+                $condition_session
                 ORDER BY title";
     }
 
@@ -992,7 +1002,6 @@ function deleteDirWork($id)
 	$course_id = api_get_course_int_id();
 
 	if (!empty($work_data['url'])) {
-
         if ($check) {
 
             // Deleting all contents inside the folder
@@ -1209,7 +1218,7 @@ function insert_all_directory_in_course_table($base_work_dir)
                title        = '',
                description 	= '',
                author      	= '',
-               active		= '0',
+               active		= '1',
                accepted		= '1',
                filetype		= 'folder',
                post_group_id = '".$group_id."',
@@ -1463,7 +1472,7 @@ function get_count_work($work_id, $onlyMeUserId = null, $notMeUserId = null)
     if ($is_allowed_to_edit) {
         $extra_conditions .= ' AND work.active IN (0, 1) ';
     } else {
-        $extra_conditions .= ' AND work.active = 1 AND accepted = 1';
+        $extra_conditions .= ' AND work.active IN (0, 1) AND accepted = 1';
         if (isset($course_info['show_score']) && $course_info['show_score'] == 1) {
             $extra_conditions .= " AND work.user_id = ".api_get_user_id()." ";
         } else {
@@ -1740,7 +1749,7 @@ function get_work_user_list_from_documents(
 
     $sql = "    (
                     $select1 FROM $userTable u
-                    INNER JOIN $workTable w ON (u.user_id = w.user_id AND w.active = 1 AND w.filetype = 'file')
+                    INNER JOIN $workTable w ON (u.user_id = w.user_id AND w.active IN (0, 1) AND w.filetype = 'file')
                     WHERE
                         w.c_id = $courseId
                         $userCondition
@@ -1750,7 +1759,7 @@ function get_work_user_list_from_documents(
 
                 ) UNION (
                     $select2 FROM $workTable w
-                    INNER JOIN $workRelDocument w_rel ON (w_rel.work_id = w.id AND w.active = 1)
+                    INNER JOIN $workRelDocument w_rel ON (w_rel.work_id = w.id AND w.active IN (0, 1))
                     INNER JOIN $documentTable d ON (w_rel.document_id = d.id AND d.c_id = w.c_id)
                     INNER JOIN $userTable u ON (u.user_id = $studentId)
                     WHERE
@@ -1763,7 +1772,7 @@ function get_work_user_list_from_documents(
                                 user_id = $studentId AND
                                 c_id = $courseId AND
                                 filetype = 'file' AND
-                                active = 1
+                                active IN (0, 1)
                                 $sessionCondition
                                 $workParentCondition
                             )
@@ -1909,7 +1918,7 @@ function get_work_user_list($start, $limit, $column, $direction, $work_id, $wher
     $group_id       = api_get_group_id();
     $course_info    = api_get_course_info(api_get_course_id());
 
-    $work_id       = intval($work_id);
+    $work_id        = intval($work_id);
     $column         = !empty($column) ? Database::escape_string($column) : 'sent_date';
     $start          = intval($start);
     $limit          = intval($limit);
@@ -1936,13 +1945,13 @@ function get_work_user_list($start, $limit, $column, $direction, $work_id, $wher
             $extra_conditions .= ' AND work.active IN (0, 1) ';
         } else {
             if (isset($course_info['show_score']) &&  $course_info['show_score'] == 1) {
-                $extra_conditions .= " AND (u.user_id = ".api_get_user_id()." AND work.active IN (0, 1) OR work.active = 1) ";
+                $extra_conditions .= " AND (u.user_id = ".api_get_user_id()." AND work.active IN (0, 1)) ";
             } else {
-                $extra_conditions .= ' AND work.active = 1 ';
+                $extra_conditions .= ' AND work.active IN (0, 1) ';
             }
         }
 
-        $extra_conditions .= " AND parent_id  = ".$work_id."  ";
+        $extra_conditions .= " AND parent_id  = ".$work_id." ";
 
         $select = 'SELECT DISTINCT
                         u.user_id,
@@ -2383,9 +2392,18 @@ function get_list_users_without_publication($task_id, $studentId = null)
 	$task_id = intval($task_id);
 
 	if ($session_id == 0) {
-		$sql = "SELECT user_id as id FROM $work_table WHERE c_id = $course_id AND parent_id='$task_id' AND active = 1";
+		$sql = "SELECT user_id as id FROM $work_table
+		        WHERE
+		            c_id = $course_id AND
+		            parent_id='$task_id' AND
+		            active IN (0, 1)";
 	} else {
-		$sql = "SELECT user_id as id FROM $work_table WHERE c_id = $course_id AND parent_id='$task_id' and session_id='".$session_id."' AND active = 1";
+		$sql = "SELECT user_id as id FROM $work_table
+		        WHERE
+		            c_id = $course_id AND
+		            parent_id='$task_id' AND
+		            session_id='".$session_id."' AND
+		            active IN (0, 1)";
 	}
 
 	$result = Database::query($sql);