diff --git a/be/app/Http/Controllers/MasterTaskController.php b/be/app/Http/Controllers/MasterTaskController.php
index 8f729d2..6bf8f64 100644
--- a/be/app/Http/Controllers/MasterTaskController.php
+++ b/be/app/Http/Controllers/MasterTaskController.php
@@ -4,15 +4,16 @@ namespace App\Http\Controllers;
 
 use App\Models\Attachment;
 use App\Models\MasterTask;
-use App\Models\Team;
+use App\Models\User;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
 
 class MasterTaskController extends Controller
 {
     public function store(Request $request)
     {
+        $created_by = User::getUserIdFromBearerToken($request->bearerToken());
+
         $validator = Validator::make($request->all(), [
             'data.name' => 'required',
             'data.description' => 'required',
@@ -30,11 +31,12 @@ class MasterTaskController extends Controller
         $data['data'] = $request->all()['data'];
         $data['data']['title'] = $request->all()['data']['name'];
         $data['data']['estimated_time'] = $request->all()['data']['duration'];
+        $data['data']['created_by'] = $created_by;
 
         foreach ( $data['data']['employees'] as $key => $employee ) {
             $data['data']['employees'][$key]['user_id'] = $employee['id'];
             $data['data']['employees'][$key]['estimated_time'] = $employee['duration'];
-            $data['data']['employees'][$key]['created_by'] = $request->all()['data']['created_by'];
+            $data['data']['employees'][$key]['created_by'] = $created_by;
         }
 
         $request->merge($data);
diff --git a/be/app/Http/Controllers/SubTaskController.php b/be/app/Http/Controllers/SubTaskController.php
index 7619896..b496647 100644
--- a/be/app/Http/Controllers/SubTaskController.php
+++ b/be/app/Http/Controllers/SubTaskController.php
@@ -2,13 +2,11 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Resources\SubTaskCollection;
 use App\Http\Resources\SubTaskResource;
 use App\Models\Attachment;
 use App\Models\MasterTask;
 use App\Models\SubTask;
-use App\Models\Team;
-use App\Models\Timesheet;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
@@ -137,6 +135,7 @@ class SubTaskController extends Controller
         $data['data'] = $request->all()['data'];
         $data['data']['user_id'] = $request->all()['data']['employee_id'];
         $data['data']['estimated_time'] = $request->all()['data']['duration'];
+        $data['data']['created_by'] = User::getUserIdFromBearerToken($request->bearerToken());
 
         $request->merge($data);
 
@@ -144,9 +143,7 @@ class SubTaskController extends Controller
         $subtask = $mastertask->subtasks()->create($request->all()['data']);
 
         // syncnutie timeblocks
-        //if (!empty($data['data']['timeblocks'])) {
-            $subtask->syncTimeblocks($data['data']['timeblocks']);
-        //}
+        $subtask->syncTimeblocks($data['data']['timeblocks']);
 
         // upload attachmentu
         if ($request->file('data')) {
diff --git a/be/app/Models/User.php b/be/app/Models/User.php
index 0e17462..885b9df 100644
--- a/be/app/Models/User.php
+++ b/be/app/Models/User.php
@@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laravel\Sanctum\HasApiTokens;
+use Laravel\Sanctum\PersonalAccessToken;
 
 class User extends Authenticatable
 {
@@ -49,4 +50,11 @@ class User extends Authenticatable
         return $this->hasMany(SubTask::class);
     }
 
+    public static function getUserIdFromBearerToken($token)
+    {
+        $token = PersonalAccessToken::findToken($token);
+
+        return $token->tokenable_id;
+    }
+
 }