diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
index e03f4368064..ca901c696a1 100644
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -136,7 +136,7 @@
     "entitlementsLoginHelper": "resources/entitlements.mas.loginhelper.plist",
     "provisioningProfile": "bitwarden_desktop_appstore.provisionprofile",
     "hardenedRuntime": true,
-    "identity": "Bitwarden Inc (LTZ2PFU5D6)",
+    "identity": "Developer ID",
     "extendInfo": {
       "LSMinimumSystemVersion": "12",
       "ElectronTeamID": "LTZ2PFU5D6"
diff --git a/apps/desktop/scripts/after-sign.js b/apps/desktop/scripts/after-sign.js
index 77c8db6babe..1db9de161a1 100644
--- a/apps/desktop/scripts/after-sign.js
+++ b/apps/desktop/scripts/after-sign.js
@@ -65,7 +65,7 @@ async function run(context) {
       if (context.targets.some((e) => e.name === "mas-dev")) {
         deepAssign(masBuildOptions, {
           type: "development",
-          identity: "Bitwarden Inc (LTZ2PFU5D6)"
+          identity: "Developer ID"          
         });
       }
       if (context.packager.packagerOptions.prepackaged == null) {
@@ -76,7 +76,7 @@ async function run(context) {
     }
   }
 
-  if (macBuild) {
+  if (macBuild  || copyAutofillExtension) {
     console.log("### Notarizing " + appPath);
     if (process.env.APP_STORE_CONNECT_TEAM_ISSUER) {
       const appleApiIssuer = process.env.APP_STORE_CONNECT_TEAM_ISSUER;