diff --git a/.github/workflows/Comment_on_Issues.yml b/.github/workflows/Comment_on_Issues.yml
index f623b99da644..6bd12f6a005b 100644
--- a/.github/workflows/Comment_on_Issues.yml
+++ b/.github/workflows/Comment_on_Issues.yml
@@ -31,8 +31,9 @@ jobs:
         with:
           issue-number: ${{ github.event.issue.number }}
           body: |
-            Thank you for creating a feature request! feature requests are prioritized by our direct contributors. Your current priority is set to "No Priority". If you are a sponsor you can request an upgrade of priority, If you want this feature to be integrated you can always do this yourself by checking out our contributions guide at https://kelvintegelaar.github.io/CIPP/GettingStarted/Contributions.html. Contributors to the CIPP project reserve the right to close feature requests at will.
-
-            If your feature request is not picked up in 2 week by a contributor it will be closed.
-
+            Thank you for creating a feature request!
+            Your current priority is set to "No Priority". No Priority Feature requests automatically get closed in two days if a contributor does not accept the FR.
+            
+            If you are a sponsor you can request an upgrade of priority. To upgrade the priority type "I would like to upgrade the priority". 
+            If you want this feature to be integrated you can always do this yourself by checking out our contributions guide at https://cipp.app/docs/dev/. Contributors to the CIPP project reserve the right to close feature requests at will.
             If you'd like this feature request to be assigned to you, please comment "I would like to work on this please!".
diff --git a/.github/workflows/azure-static-web-apps-brave-sand-047d97703.yml b/.github/workflows/azure-static-web-apps-brave-sand-047d97703.yml
new file mode 100644
index 000000000000..c7dc14cd3818
--- /dev/null
+++ b/.github/workflows/azure-static-web-apps-brave-sand-047d97703.yml
@@ -0,0 +1,45 @@
+name: Azure Static Web Apps CI/CD
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+    branches:
+      - main
+
+jobs:
+  build_and_deploy_job:
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    runs-on: ubuntu-latest
+    name: Build and Deploy Job
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Build And Deploy
+        id: builddeploy
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BRAVE_SAND_047D97703 }}
+          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+          action: "upload"
+          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
+          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
+          app_location: "/" # App source code path
+          api_location: "" # Api source code path - optional
+          output_location: "" # Built app content directory - optional
+          ###### End of Repository/Build Configurations ######
+
+  close_pull_request_job:
+    if: github.event_name == 'pull_request' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    name: Close Pull Request Job
+    steps:
+      - name: Close Pull Request
+        id: closepullrequest
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BRAVE_SAND_047D97703 }}
+          action: "close"
diff --git a/.github/workflows/label_sponsor_requests.yml b/.github/workflows/label_sponsor_requests.yml
new file mode 100644
index 000000000000..b6096b76b35e
--- /dev/null
+++ b/.github/workflows/label_sponsor_requests.yml
@@ -0,0 +1,17 @@
+---
+name: Label Issues
+on:  # yamllint disable-line rule:truthy
+  issues:
+    types:
+      - opened
+jobs:
+  label_issues_bugs:
+    if: contains(github.event.issue.title,'Bug')
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - name: Sponsor Labels
+        uses: JasonEtco/is-sponsor-label-action@v1.2.0
+        with:
+         label: 'Sponsor Request'
diff --git a/README.md b/README.md
index b6077cb99dec..9e42be1b45e1 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ The current build functionality is described below, also check out our Changelog
   - Remove user licenses
   - Convert user to shared mailbox
   - Disable user sign-in
-  - Reset user passord
+  - Reset user password
   - Remove user from all groups
   - Hide user from address list
   - Set Out of Office
diff --git a/src/views/identity/administration/Users.js b/src/views/identity/administration/Users.js
index 2732b526db3d..9551be46e20d 100644
--- a/src/views/identity/administration/Users.js
+++ b/src/views/identity/administration/Users.js
@@ -128,6 +128,19 @@ const Offcanvas = (row, rowIndex, formatExtraData) => {
             modalUrl: `/api/ExecSetOoO`,
             modalMessage: 'Are you sure you want to disable the out of office?',
           },
+          {
+            label: 'Disable Email Forwarding',
+            color: 'info',
+            modal: true,
+            modalType: 'POST',
+            modalBody: {
+              user: row.userPrincipalName,
+              TenantFilter: tenant.defaultDomainName,
+              message: row.message,
+            },
+            modalUrl: `/api/ExecDisableEmailForward`,
+            modalMessage: 'Are you sure you want to disable forwarding of this users emails?',
+          },
           {
             label: 'Block Sign In',
             color: 'info',