diff --git a/app/Service/UserService.php b/app/Service/UserService.php
index bf8b1261..5cefb62f 100644
--- a/app/Service/UserService.php
+++ b/app/Service/UserService.php
@@ -62,6 +62,7 @@ class UserService
                 $intervalFormat,
                 $timeFormat,
             );
+            $this->switchCurrentOrganization($user, $organization);
         }
 
         return $user;
diff --git a/tests/Feature/RegistrationTest.php b/tests/Feature/RegistrationTest.php
index 28caaf6e..d5b59ef0 100644
--- a/tests/Feature/RegistrationTest.php
+++ b/tests/Feature/RegistrationTest.php
@@ -61,6 +61,7 @@ class RegistrationTest extends TestCaseWithDatabase
         $member = Member::query()->whereBelongsTo($user, 'user')->whereBelongsTo($organization, 'organization')->firstOrFail();
         $this->assertSame(Role::Owner->value, $member->role);
         Event::assertNotDispatched(NewsletterRegistered::class);
+        $this->assertSame($organization->getKey(), $user->current_team_id);
     }
 
     public function test_user_registration_fails_if_registration_is_deactivated(): void