diff --git a/.github/workflows/generate-client.yml b/.github/workflows/generate-client.yml
index b181f90..827195f 100644
--- a/.github/workflows/generate-client.yml
+++ b/.github/workflows/generate-client.yml
@@ -12,7 +12,11 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
+    # For PRs from forks
     - uses: actions/checkout@v4
+    # For PRs from the same repo
+    - uses: actions/checkout@v4
+      if: ( github.event_name != 'pull_request' || github.secret_source == 'Actions' )
       with:
         ref: ${{ github.head_ref }}
         token: ${{ secrets.FULL_STACK_FASTAPI_TEMPLATE_REPO_TOKEN }}
@@ -35,10 +39,19 @@ jobs:
     - run: uv run bash scripts/generate-client.sh
       env:
         VIRTUAL_ENV: backend/.venv
-    - name: Commit changes
+    - name: Add changes to git
       run: |
         git config --local user.email "github-actions@github.com"
         git config --local user.name "github-actions"
         git add frontend/src/client
+    # Same repo PRs
+    - name: Push changes
+      if: ( github.event_name != 'pull_request' || github.secret_source == 'Actions' )
+      run: |
         git diff --staged --quiet || git commit -m "✨ Autogenerate frontend client"
         git push
+    # Fork PRs
+    - name: Check changes
+      if: ( github.event_name == 'pull_request' && github.secret_source != 'Actions' )
+      run: |
+        git diff --staged --quiet || echo "Changes detected in generated client, run scripts/generate-client.sh and commit the changes"