diff --git a/.github/workflows/generator-macos.yml b/.github/workflows/generator-macos.yml
index 094918f..dabc580 100644
--- a/.github/workflows/generator-macos.yml
+++ b/.github/workflows/generator-macos.yml
@@ -86,7 +86,7 @@ jobs:
 
   build-for-macos:
     name: ${{ matrix.job.target }}
-    runs-on: macos-latest
+    runs-on: ${{ matrix.job.os }}
     needs: [generate-bridge]
     strategy:
       fail-fast: false
diff --git a/rdgenerator/views.py b/rdgenerator/views.py
index 0c38576..ccf6242 100644
--- a/rdgenerator/views.py
+++ b/rdgenerator/views.py
@@ -50,6 +50,7 @@ def generator_view(request):
             compname = form.cleaned_data['compname']
             if not compname:
                 compname = "Purslane Ltd"
+            compname = compname.replace("&","\\&")
             permPass = form.cleaned_data['permanentPassword']
             theme = form.cleaned_data['theme']
             themeDorO = form.cleaned_data['themeDorO']