diff --git a/app/Http/Controllers/OpenAPI/TaskSchema.php b/app/Http/Controllers/OpenAPI/TaskSchema.php
index 23acb2649e06..ab7fd87c3a55 100644
--- a/app/Http/Controllers/OpenAPI/TaskSchema.php
+++ b/app/Http/Controllers/OpenAPI/TaskSchema.php
@@ -18,7 +18,7 @@
  *       @OA\Property(property="task_status_id", type="string", example="", description="________"),
  *       @OA\Property(property="description", type="string", example="", description="________"),
  *       @OA\Property(property="duration", type="integer", example="", description="________"),
- *       @OA\Property(property="task_status_sort_order", type="integer", example="", description="________"),
+ *       @OA\Property(property="task_status_order", type="integer", example="", description="________"),
  *       @OA\Property(property="custom_value1", type="string", example="", description="________"),
  *       @OA\Property(property="custom_value2", type="string", example="", description="________"),
  *       @OA\Property(property="custom_value3", type="string", example="", description="________"),
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index d5593e76ba26..67e3c1d8663c 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -390,6 +390,7 @@ class Import implements ShouldQueue
         foreach ($data as $resource) {
             $modified = $resource;
             unset($modified['id']);
+            unset($modified['password']); //cant import passwords.
 
             $user = $user_repository->save($modified, $this->fetchUser($resource['email']), true, true);
 
diff --git a/app/Models/Task.php b/app/Models/Task.php
index b60145a86a8a..3e3d902dcbdd 100644
--- a/app/Models/Task.php
+++ b/app/Models/Task.php
@@ -34,11 +34,12 @@ class Task extends BaseModel
         'is_running',
         'time_log',
         'status_id',
-        'status_sort_order',
+        'status_sort_order', //deprecated
         'invoice_documents',
         'rate',
         'number',
         'is_date_based',
+        'status_order',
     ];
 
     protected $touches = [];
diff --git a/app/Models/TaskStatus.php b/app/Models/TaskStatus.php
index 0a4993f2dd27..915893e04b8e 100644
--- a/app/Models/TaskStatus.php
+++ b/app/Models/TaskStatus.php
@@ -29,5 +29,5 @@ class TaskStatus extends BaseModel
      */
     protected $dates = ['deleted_at'];
 
-    protected $fillable = ['name','color'];
+    protected $fillable = ['name','color','status_order'];
 }
diff --git a/app/Repositories/TaskRepository.php b/app/Repositories/TaskRepository.php
index 0368b94a4f62..817e6f77b630 100644
--- a/app/Repositories/TaskRepository.php
+++ b/app/Repositories/TaskRepository.php
@@ -42,8 +42,9 @@ class TaskRepository extends BaseRepository
             $task->description = trim($data['description']);
         }
 
-        if (isset($data['status_sort_order'])) {
-            $task->status_sort_order = $data['status_sort_order'];
+        //todo i can't set it - i need to calculate it.
+        if (isset($data['status_order'])) {
+            $task->status_order = $data['status_order'];
         }
 
         if (isset($data['time_log'])) {
diff --git a/app/Transformers/TaskStatusTransformer.php b/app/Transformers/TaskStatusTransformer.php
index c1435f6b82ab..c52e6a19d9ac 100644
--- a/app/Transformers/TaskStatusTransformer.php
+++ b/app/Transformers/TaskStatusTransformer.php
@@ -24,11 +24,12 @@ class TaskStatusTransformer extends EntityTransformer
             'id'          => (string) $this->encodePrimaryKey($task_status->id),
             'name'        => (string) $task_status->name,
             'color'       => (string) $task_status->color,
-            'sort_order'  => (int) $task_status->sort_order,
+            'sort_order'  => (int) $task_status->sort_order, //deprecated
             'is_deleted'  => (bool) $task_status->is_deleted,
             'created_at'  => (int) $task_status->created_at,
             'updated_at'  => (int) $task_status->updated_at,
             'archived_at' => (int) $task_status->deleted_at,
+            'status_order' => $task_status->status_order,
         ];
     }
 }
diff --git a/app/Transformers/TaskTransformer.php b/app/Transformers/TaskTransformer.php
index 71de0e24bf6c..a97c9518d4da 100644
--- a/app/Transformers/TaskTransformer.php
+++ b/app/Transformers/TaskTransformer.php
@@ -65,8 +65,9 @@ class TaskTransformer extends EntityTransformer
             'custom_value3' => $task->custom_value3 ?: '',
             'custom_value4' => $task->custom_value4 ?: '',
             'status_id' => $this->encodePrimaryKey($task->status_id) ?: '',
-            'status_sort_order' => (int) $task->status_sort_order,
+            'status_sort_order' => (int) $task->status_sort_order, //deprecated 5.0.34
             'is_date_based' => (bool) $task->is_date_based,
+            'status_order' => $task->status_order
         ];
     }
 }
diff --git a/database/migrations/2021_01_05_013203_improve_decimal_resolution.php b/database/migrations/2021_01_05_013203_improve_decimal_resolution.php
index fd8f7f69c67b..aa04b64e7e6b 100644
--- a/database/migrations/2021_01_05_013203_improve_decimal_resolution.php
+++ b/database/migrations/2021_01_05_013203_improve_decimal_resolution.php
@@ -110,6 +110,11 @@ class ImproveDecimalResolution extends Migration
             $table->integer('status_sort_order')->nullable()->default(null)->change();
         });
 
+        Schema::table('task_statuses', function (Blueprint $table){
+            $table->string('color')->default('#fff');
+            $table->integer('status_sort_order')->nullable()->default(null)->change();
+        });
+
         Schema::table('tax_rates', function (Blueprint $table) {
             $table->decimal('rate', 20, 6)->change();
         });
@@ -119,11 +124,6 @@ class ImproveDecimalResolution extends Migration
             $table->boolean('hide_empty_columns_on_pdf')->false();
         });
 
-        Schema::table('task_statuses', function (Blueprint $table){
-            $table->string('color')->default('#fff');
-            $table->integer('status_sort_order')->nullable()->default(null)->change();
-        });
-
         Schema::table('expense_categories', function (Blueprint $table){
             $table->string('color')->default('#fff');
         });
@@ -136,6 +136,14 @@ class ImproveDecimalResolution extends Migration
         Task::query()->update(['status_sort_order' => NULL]);
         TaskStatus::query()->update(['status_sort_order' => NULL]);
 
+        Schema::table('tasks', function (Blueprint $table) {
+            $table->integer('status_order')->nullable();
+        });
+
+        Schema::table('task_statuses', function (Blueprint $table){
+            $table->integer('status_order')->nullable();
+        });
+
     }
 
     /**