diff --git a/app/Models/Oasis/SubscriptionRequest.php b/app/Models/Oasis/SubscriptionRequest.php
index b1ef3f85..7a258320 100644
--- a/app/Models/Oasis/SubscriptionRequest.php
+++ b/app/Models/Oasis/SubscriptionRequest.php
@@ -3,6 +3,7 @@
 namespace App\Models\Oasis;
 
 use App\Models\User;
+use Auth;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
@@ -12,7 +13,7 @@ class SubscriptionRequest extends Model
     use HasFactory;
 
     protected $fillable = [
-        'requested_plan'
+        'requested_plan', 'creator'
     ];
 
     public $incrementing = false;
@@ -30,6 +31,7 @@ class SubscriptionRequest extends Model
 
         static::creating(function ($order) {
             $order->id = (string)Str::uuid();
+            $order->creator = Auth::user()->email ?? $order->creator;
         });
     }
 }
diff --git a/tests/Feature/Oasis/OasisAdminTest.php b/tests/Feature/Oasis/OasisAdminTest.php
index 1d0d09e9..eb5b0d2a 100644
--- a/tests/Feature/Oasis/OasisAdminTest.php
+++ b/tests/Feature/Oasis/OasisAdminTest.php
@@ -89,6 +89,7 @@ class OasisAdminTest extends TestCase
         $this->assertDatabaseHas('subscription_requests', [
             'requested_plan' => 'virtualni-sanon-basic',
             'status'         => 'requested',
+            'creator'        => $admin->email,
         ]);
 
         $this->assertDatabaseHas('users', [
diff --git a/tests/Feature/Oasis/OasisSubscriptionTest.php b/tests/Feature/Oasis/OasisSubscriptionTest.php
index ed58f3dd..f4042328 100644
--- a/tests/Feature/Oasis/OasisSubscriptionTest.php
+++ b/tests/Feature/Oasis/OasisSubscriptionTest.php
@@ -61,6 +61,7 @@ class OasisSubscriptionTest extends TestCase
             ->subscriptionRequest()
             ->create([
                 'requested_plan' => 'virtualni-sanon-basic',
+                'creator'        => 'john@doe.com',
             ]);
 
         $this->getJson("/api/oasis/subscription-request/{$user->subscriptionRequest->id}")
@@ -83,6 +84,7 @@ class OasisSubscriptionTest extends TestCase
             ->subscriptionRequest()
             ->create([
                 'requested_plan' => 'virtualni-sanon-basic',
+                'creator'        => 'john@doe.com',
             ]);
 
         // Register payment method