diff --git a/app/Services/Auth/OauthLoginService.php b/app/Services/Auth/OauthLoginService.php
index 8a79ed157f..25b4f0ae82 100644
--- a/app/Services/Auth/OauthLoginService.php
+++ b/app/Services/Auth/OauthLoginService.php
@@ -101,7 +101,7 @@ class OauthLoginService
         $providerUserId = (string) $providerUserId;
         $rawClaims = is_array($oauthUser->user ?? null) ? $oauthUser->user : [];
 
-        if ($provider === 'google' && filled($oauthSetting->tenant) && data_get($rawClaims, 'hd') !== $oauthSetting->tenant) {
+        if ($provider === 'google' && ! $this->isInGoogleWorkspace($oauthSetting->tenant, data_get($rawClaims, 'hd'))) {
             throw new HttpException(403, 'Google account is not in the configured Workspace');
         }
 
@@ -134,9 +134,11 @@ class OauthLoginService
 
                 // Before OAuth identities existed, OAuth sign-in matched users by email only.
                 // Users from that time keep signing in without email delivery, so their
-                // first identity links without a provider verification claim. This check
-                // runs first, so an unverified email cannot reveal a linked account.
-                if ($user?->created_before_oauth_identities !== true && ! $this->hasVerifiedEmail($provider, $rawClaims, $email)) {
+                // first identity links without a provider verification claim. A user who
+                // has a password never gets this exemption. This check runs first, so an
+                // unverified email cannot reveal a linked account.
+                $isPreUpgradeOauthUser = $user?->created_before_oauth_identities === true && ! $user->hasPassword();
+                if (! $isPreUpgradeOauthUser && ! $this->hasVerifiedEmail($provider, $rawClaims, $email)) {
                     throw new OauthLoginException('OAuth provider did not verify the email address', 'auth.failed.oauth_email_unverified');
                 }
 
@@ -173,6 +175,25 @@ class OauthLoginService
         }
     }
 
+    /**
+     * An empty hosted domain allows every Google account. A "*" allows any
+     * Workspace account. Domains are compared without case and spaces.
+     */
+    private function isInGoogleWorkspace(?string $hostedDomain, mixed $hdClaim): bool
+    {
+        $hostedDomain = strtolower(trim((string) $hostedDomain));
+        if ($hostedDomain === '') {
+            return true;
+        }
+
+        $hdClaim = is_string($hdClaim) ? strtolower(trim($hdClaim)) : '';
+        if ($hdClaim === '') {
+            return false;
+        }
+
+        return $hostedDomain === '*' || $hdClaim === $hostedDomain;
+    }
+
     /**
      * GitHub and Bitbucket select only verified primary email addresses in
      * their Socialite providers. Microsoft Graph has no verification flag, but
diff --git a/resources/views/livewire/settings-oauth.blade.php b/resources/views/livewire/settings-oauth.blade.php
index a24224dbcb..1640f19c56 100644
--- a/resources/views/livewire/settings-oauth.blade.php
+++ b/resources/views/livewire/settings-oauth.blade.php
@@ -97,7 +97,7 @@
                         @if ($provider === 'google')
                             <x-forms.input canGate="update" :canResource="$settings"
                                 id="oauth_settings_map.{{ $provider }}.tenant"
-                                helper="Optional hosted domain supplied to Google as a login hint."
+                                helper="Optional Google Workspace domain, for example example.com. Only accounts from this domain can sign in. Use * to allow any Workspace account but no personal Google accounts."
                                 label="Hosted domain" />
                         @endif
 
diff --git a/tests/Feature/OauthControllerTest.php b/tests/Feature/OauthControllerTest.php
index 5a5a8febb4..3f944d2941 100644
--- a/tests/Feature/OauthControllerTest.php
+++ b/tests/Feature/OauthControllerTest.php
@@ -386,8 +386,36 @@ it('links a user from before the upgrade without an email verification claim', f
 })->with([
     'discord unverified, user created by OAuth' => ['discord', ['verified' => false], null],
     'authentik default email scope, user created by OAuth' => ['authentik', ['email_verified' => false], null],
-    'discord unverified, user with a password' => ['discord', ['verified' => false], 'password'],
-    'authentik default email scope, user with a password' => ['authentik', ['email_verified' => false], 'password'],
+]);
+
+it('does not link an unverified provider email to a flagged user who has a password', function (string $provider, array $rawClaims) {
+    // A pre-upgrade OAuth user who set a password (for example through a password
+    // reset) before the first OAuth login, or a password user on an instance that
+    // ran the first version of the migration.
+    $user = User::factory()->create([
+        'email' => 'legacy@example.com',
+        'password' => 'password',
+        'created_before_oauth_identities' => true,
+    ]);
+    $setting = OauthSetting::updateOrCreate(['provider' => $provider], [
+        'client_id' => 'client-id',
+        'client_secret' => 'client-secret',
+        'base_url' => 'https://auth.example.com',
+        'enabled' => true,
+    ]);
+
+    expect(fn () => app(OauthLoginService::class)->login($provider, (object) [
+        'email' => 'legacy@example.com',
+        'name' => 'Attacker',
+        'id' => 'attacker-provider-id',
+        'user' => $rawClaims,
+    ], $setting))->toThrow(HttpException::class, 'OAuth provider did not verify the email address');
+
+    expect(OauthIdentity::count())->toBe(0);
+    $this->assertGuest();
+})->with([
+    'discord unverified' => ['discord', ['verified' => false]],
+    'authentik default email scope' => ['authentik', ['email_verified' => false]],
 ]);
 
 it('does not link a second provider to a user from before the upgrade', function () {
@@ -806,3 +834,32 @@ describe('callback error messages', function () {
         $this->assertGuest();
     });
 });
+
+it('matches the Google hosted domain without case or spaces and accepts any Workspace for a wildcard', function (string $tenant, ?string $hostedDomain, bool $allowed) {
+    $user = User::factory()->create(['email' => 'user@example.com']);
+    $setting = OauthSetting::where('provider', 'google')->firstOrFail();
+    $setting->update(['tenant' => $tenant]);
+    $claims = array_filter(['email_verified' => true, 'hd' => $hostedDomain], fn ($value) => $value !== null);
+
+    $login = fn () => app(OauthLoginService::class)->login('google', (object) [
+        'email' => $user->email,
+        'name' => 'Workspace User',
+        'id' => 'google-workspace-id',
+        'user' => $claims,
+    ], $setting);
+
+    if ($allowed) {
+        expect($login()->is($user))->toBeTrue();
+    } else {
+        expect($login)->toThrow(HttpException::class, 'Google account is not in the configured Workspace');
+        $this->assertGuest();
+    }
+})->with([
+    'mixed-case tenant' => ['Example.com', 'example.com', true],
+    'tenant with spaces' => [' example.com ', 'example.com', true],
+    'mixed-case hd claim' => ['example.com', 'EXAMPLE.com', true],
+    'wildcard with a Workspace account' => ['*', 'any-company.example', true],
+    'wildcard with a personal account' => ['*', null, false],
+    'other domain' => ['example.com', 'example.org', false],
+    'personal account' => ['example.com', null, false],
+]);