diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart
index 24e9e43e0..f952544d9 100644
--- a/lib/data/models/task_model.dart
+++ b/lib/data/models/task_model.dart
@@ -77,6 +77,8 @@ class TaskFields {
   static const String status = 'status';
   static const String isInvoiced = 'is_invoiced';
   static const String date = 'date';
+  static const String assignedTo = 'assigned_to';
+  static const String createdBy = 'created_by';
 }
 
 abstract class TaskTime implements Built<TaskTime, TaskTimeBuilder> {
@@ -719,6 +721,20 @@ abstract class TaskEntity extends Object
         response = compareNatural(
             taskA.number.toLowerCase(), taskB.number.toLowerCase());
         break;
+      case TaskFields.createdBy:
+        final userA = userMap[taskA.createdUserId] ?? UserEntity();
+        final userB = userMap[taskB.createdUserId] ?? UserEntity();
+        response = userA.fullName
+            .toLowerCase()
+            .compareTo(userB.fullName.toLowerCase());
+        break;
+      case TaskFields.assignedTo:
+        final userA = userMap[taskA.assignedUserId] ?? UserEntity();
+        final userB = userMap[taskB.assignedUserId] ?? UserEntity();
+        response = userA.fullName
+            .toLowerCase()
+            .compareTo(userB.fullName.toLowerCase());
+        break;
       case TaskFields.status:
         final taskAStatus = taskA.isRunning
             ? -1