diff --git a/extension/chrome/settings/setup.htm b/extension/chrome/settings/setup.htm
index ce4f6538767..bb61f2a4a9f 100644
--- a/extension/chrome/settings/setup.htm
+++ b/extension/chrome/settings/setup.htm
@@ -207,7 +207,7 @@ <h1>Set Up FlowCrypt</h1>
               Submit corresponding pubkey to FlowCrypt Attester
             </label>
           </div>
-          <div class="line left remove_if_pubkey_submitting_not_user_configurable" style="visibility: hidden;">
+          <div class="line left remove_if_pubkey_submitting_not_user_configurable container_for_import_key_email_alias" data-test="container-for-import-key-email-alias" style="visibility: hidden;">
             <label>
               <input type="checkbox" class="input_submit_all" disabled="disabled" />
               <span>
diff --git a/extension/chrome/settings/setup.ts b/extension/chrome/settings/setup.ts
index 1a50d14c43d..bcb25c99a55 100644
--- a/extension/chrome/settings/setup.ts
+++ b/extension/chrome/settings/setup.ts
@@ -84,8 +84,8 @@ export class SetupView extends View {
     } else {
       window.location.href = 'index.htm';
     }
-    this.submitKeyForAddrs = [this.acctEmail];
-    this.keyImportUi.initPrvImportSrcForm(this.acctEmail, this.parentTabId); // for step_2b_manual_enter, if user chooses so
+    this.submitKeyForAddrs = [];
+    this.keyImportUi.initPrvImportSrcForm(this.acctEmail, this.parentTabId, this.submitKeyForAddrs); // for step_2b_manual_enter, if user chooses so
     this.keyImportUi.onBadPassphrase = () => $('#step_2b_manual_enter .input_passphrase').val('').focus();
     this.keyImportUi.renderPassPhraseStrengthValidationInput($('#step_2a_manual_create .input_password'), $('#step_2a_manual_create .action_proceed_private'));
     this.keyImportUi.renderPassPhraseStrengthValidationInput($('#step_2_ekm_choose_pass_phrase .input_password'), $('#step_2_ekm_choose_pass_phrase .action_proceed_private'));
@@ -201,10 +201,11 @@ export class SetupView extends View {
     const inputSubmitAll = $(target).closest('.manual').find('.input_submit_all').first();
     if ($(target).prop('checked')) {
       if (inputSubmitAll.closest('div.line').css('visibility') === 'visible') {
-        inputSubmitAll.prop({ checked: true, disabled: false });
+        $('.input_email_alias').prop({ disabled: false });
       }
     } else {
-      inputSubmitAll.prop({ checked: false, disabled: true });
+      $('.input_email_alias').prop({ checked: false });
+      $('.input_email_alias').prop({ disabled: true });
     }
   }
 
@@ -216,19 +217,23 @@ export class SetupView extends View {
     }
   }
 
-  public preFinalizeSetup = async (options: SetupOptions): Promise<void> => {
-    await AcctStore.set(this.acctEmail, { tmp_submit_main: options.submit_main, tmp_submit_all: options.submit_all });
-  }
-
-  public submitPublicKeysAndFinalizeSetup = async ({ submit_main, submit_all }: { submit_main: boolean, submit_all: boolean }): Promise<void> => {
+  public submitPublicKeys = async (
+    { submit_main, submit_all }: { submit_main: boolean, submit_all: boolean }
+  ): Promise<void> => {
     const primaryKi = await KeyStore.getFirstRequired(this.acctEmail);
     try {
       await this.submitPublicKeyIfNeeded(primaryKi.public, { submit_main, submit_all });
     } catch (e) {
-      return await Settings.promptToRetry(e, Lang.setup.failedToSubmitToAttester, () => this.submitPublicKeysAndFinalizeSetup({ submit_main, submit_all }));
+      return await Settings.promptToRetry(
+        e,
+        Lang.setup.failedToSubmitToAttester,
+        () => this.submitPublicKeys({ submit_main, submit_all })
+      );
     }
+  }
+
+  public finalizeSetup = async (): Promise<void> => {
     await AcctStore.set(this.acctEmail, { setup_date: Date.now(), setup_done: true, cryptup_enabled: true });
-    await AcctStore.remove(this.acctEmail, ['tmp_submit_main', 'tmp_submit_all']);
   }
 
   public saveKeysAndPassPhrase = async (prvs: Key[], options: SetupOptions) => {
@@ -237,9 +242,11 @@ export class SetupView extends View {
       await PassphraseStore.set((options.passphrase_save && !this.orgRules.forbidStoringPassPhrase()) ? 'local' : 'session',
         this.acctEmail, { longid: KeyUtil.getPrimaryLongid(prv) }, options.passphrase);
     }
+    const { sendAs } = await AcctStore.get(this.acctEmail, ['sendAs']);
+    const myOwnEmailsAddrs: string[] = [this.acctEmail].concat(Object.keys(sendAs!));
     const myOwnEmailAddrsAsContacts: Contact[] = [];
     const { full_name: name } = await AcctStore.get(this.acctEmail, ['full_name']);
-    for (const email of this.submitKeyForAddrs) {
+    for (const email of myOwnEmailsAddrs) {
       myOwnEmailAddrsAsContacts.push(await ContactStore.obj({ email, name, pubkey: KeyUtil.armor(await KeyUtil.asPublicKey(prvs[0])) }));
     }
     await ContactStore.save(undefined, myOwnEmailAddrsAsContacts);
diff --git a/extension/chrome/settings/setup/setup-create-key.ts b/extension/chrome/settings/setup/setup-create-key.ts
index bd685320357..0cdc7a3b2ac 100644
--- a/extension/chrome/settings/setup/setup-create-key.ts
+++ b/extension/chrome/settings/setup/setup-create-key.ts
@@ -37,12 +37,13 @@ export class SetupCreateKeyModule {
       const keyIdentity = await this.createSaveKeyPair(opts, keyAlgo);
       if (keyIdentity) {
         if (this.view.orgRules.canBackupKeys()) {
-          await this.view.preFinalizeSetup(opts);
+          await this.view.submitPublicKeys(opts);
           const action = $('#step_2a_manual_create .input_backup_inbox').prop('checked') ? 'setup_automatic' : 'setup_manual';
           // only finalize after backup is done. backup.htm will redirect back to this page with ?action=finalize
           window.location.href = Url.create('modules/backup.htm', { action, acctEmail: this.view.acctEmail, idToken: this.view.idToken, id: keyIdentity.id, type: keyIdentity.type });
         } else {
-          await this.view.submitPublicKeysAndFinalizeSetup(opts);
+          await this.view.submitPublicKeys(opts);
+          await this.view.finalizeSetup();
           await this.view.setupRender.renderSetupDone();
         }
       }
diff --git a/extension/chrome/settings/setup/setup-import-key.ts b/extension/chrome/settings/setup/setup-import-key.ts
index 856132e8afa..0a76eea34e0 100644
--- a/extension/chrome/settings/setup/setup-import-key.ts
+++ b/extension/chrome/settings/setup/setup-import-key.ts
@@ -39,8 +39,8 @@ export class SetupImportKeyModule {
       }
       Xss.sanitizeRender('#step_2b_manual_enter .action_add_private_key', Ui.spinner('white'));
       await this.view.saveKeysAndPassPhrase([checked.encrypted], options);
-      await this.view.preFinalizeSetup(options);
-      await this.view.submitPublicKeysAndFinalizeSetup(options);
+      await this.view.submitPublicKeys(options);
+      await this.view.finalizeSetup();
       await this.view.setupRender.renderSetupDone();
     } catch (e) {
       if (e instanceof UserAlert) {
@@ -69,8 +69,8 @@ export class SetupImportKeyModule {
       return;
     }
     await this.view.saveKeysAndPassPhrase([fixedPrv], options);
-    await this.view.preFinalizeSetup(options);
-    await this.view.submitPublicKeysAndFinalizeSetup(options);
+    await this.view.submitPublicKeys(options);
+    await this.view.finalizeSetup();
     await this.view.setupRender.renderSetupDone();
   }
 }
diff --git a/extension/chrome/settings/setup/setup-key-manager-autogen.ts b/extension/chrome/settings/setup/setup-key-manager-autogen.ts
index e937a0a5db1..d48afc38a93 100644
--- a/extension/chrome/settings/setup/setup-key-manager-autogen.ts
+++ b/extension/chrome/settings/setup/setup-key-manager-autogen.ts
@@ -46,7 +46,8 @@ export class SetupWithEmailKeyManagerModule {
         window.location.href = Url.create('index.htm', { acctEmail: this.view.acctEmail });
         return;
       }
-      await this.view.submitPublicKeysAndFinalizeSetup(setupOptions);
+      await this.view.submitPublicKeys(setupOptions);
+      await this.view.finalizeSetup();
       await this.view.setupRender.renderSetupDone();
     } catch (e) {
       if (ApiErr.isNetErr(e) && await Api.isInternetAccessible()) { // frendly message when key manager is down, helpful during initial infrastructure setup
diff --git a/extension/chrome/settings/setup/setup-recover-key.ts b/extension/chrome/settings/setup/setup-recover-key.ts
index 71a5b86d5aa..0900f037ed9 100644
--- a/extension/chrome/settings/setup/setup-recover-key.ts
+++ b/extension/chrome/settings/setup/setup-recover-key.ts
@@ -66,8 +66,8 @@ export class SetupRecoverKeyModule {
       await this.view.saveKeysAndPassPhrase(newlyMatchingKeys, options);
       const { setup_done } = await AcctStore.get(this.view.acctEmail, ['setup_done']);
       if (!setup_done) { // normal situation - fresh setup
-        await this.view.preFinalizeSetup(options);
-        await this.view.submitPublicKeysAndFinalizeSetup(options);
+        await this.view.submitPublicKeys(options);
+        await this.view.finalizeSetup();
         await this.view.setupRender.renderSetupDone();
       } else { // setup was finished before, just added more keys now
         await this.view.setupRender.renderSetupDone();
diff --git a/extension/chrome/settings/setup/setup-render.ts b/extension/chrome/settings/setup/setup-render.ts
index efb21077d59..df9e682e719 100644
--- a/extension/chrome/settings/setup/setup-render.ts
+++ b/extension/chrome/settings/setup/setup-render.ts
@@ -10,6 +10,8 @@ import { AcctStore } from '../../../js/common/platform/store/acct-store.js';
 import { KeyStore } from '../../../js/common/platform/store/key-store.js';
 import { Ui } from '../../../js/common/browser/ui.js';
 import { PgpPwd } from '../../../js/common/core/crypto/pgp/pgp-password.js';
+import { Xss } from '../../../js/common/platform/xss.js';
+import { KeyImportUi } from '../../../js/common/ui/key-import-ui.js';
 
 export class SetupRenderModule {
 
@@ -39,12 +41,7 @@ export class SetupRenderModule {
         await this.view.setupRecoverKey.renderAddKeyFromBackup();
       }
     } else if (this.view.action === 'finalize') {
-      const { tmp_submit_all, tmp_submit_main } = await AcctStore.get(this.view.acctEmail, ['tmp_submit_all', 'tmp_submit_main']);
-      if (typeof tmp_submit_all === 'undefined' || typeof tmp_submit_main === 'undefined') {
-        $('#content').text(`Setup session expired. To set up FlowCrypt, please click the FlowCrypt icon on top right.`);
-        return;
-      }
-      await this.view.submitPublicKeysAndFinalizeSetup({ submit_all: tmp_submit_all, submit_main: tmp_submit_main });
+      await this.view.finalizeSetup();
       await this.renderSetupDone();
     } else if (this.view.orgRules.mustAutoImportOrAutogenPrvWithKeyManager()) {
       if (this.view.orgRules.mustAutogenPassPhraseQuietly() && this.view.orgRules.forbidStoringPassPhrase()) {
@@ -137,11 +134,30 @@ export class SetupRenderModule {
   }
 
   private saveAndFillSubmitPubkeysOption = (addresses: string[]) => {
-    this.view.submitKeyForAddrs = this.filterAddressesForSubmittingKeys(addresses);
-    if (this.view.submitKeyForAddrs.length > 1) {
-      $('.addresses').text(Value.arr.withoutVal(this.view.submitKeyForAddrs, this.view.acctEmail).join(', '));
-      $('.manual .input_submit_all').prop({ checked: true, disabled: false }).closest('div.line').css('display', 'block');
+    this.renderEmailAddresses(this.filterAddressesForSubmittingKeys(addresses));
+  }
+
+  private renderEmailAddresses = (addresses: string[]) => {
+    $('.input_submit_all').hide();
+    const emailAliases = Value.arr.withoutVal(addresses, this.view.acctEmail);
+    for (const e of emailAliases) {
+      // eslint-disable-next-line max-len
+      $('.addresses').append(`<label><input type="checkbox" class="input_email_alias" data-email="${Xss.escape(e)}" data-test="input-email-alias-${e.replace(/[^a-z0-9]+/g, '')}" />${Xss.escape(e)}</label><br/>`); // xss-escaped
+    }
+    $('.input_email_alias').click((event) => {
+      const email = String($(event.target).data('email'));
+      if ($(event.target).prop('checked')) {
+        if (!this.view.submitKeyForAddrs.includes(email)) {
+          KeyImportUi.addAliasForSubmission(email, this.view.submitKeyForAddrs);
+        }
+      } else {
+        KeyImportUi.removeAliasFromSubmission(email, this.view.submitKeyForAddrs);
+      }
+    });
+    if (emailAliases.length > 0) {
+      $('.container_for_import_key_email_alias').css('visibility', 'visible');
     }
+    $('.manual .input_submit_all').prop({ checked: true, disabled: false }).closest('div.line').css('display', 'block');
   }
 
   private filterAddressesForSubmittingKeys = (addresses: string[]): string[] => {
diff --git a/extension/css/cryptup.css b/extension/css/cryptup.css
index 48304707e05..eadfdd1fb75 100644
--- a/extension/css/cryptup.css
+++ b/extension/css/cryptup.css
@@ -61,6 +61,7 @@ td.green,
 b.green,
 span.green { color: #31a217; }
 
+button,
 .line.gray,
 td.gray,
 b.gray,
@@ -131,6 +132,7 @@ span.gray { color: #b7b7b7; }
   color: white;
 }
 
+button.btn_disabled,
 .swal2-popup .swal2-styled.swal2-confirm.ui-modal-warning-confirm,
 .swal2-popup .swal2-styled.swal2-cancel.ui-modal-confirm-cancel,
 .swal2-popup .swal2-styled.swal2-cancel.ui-modal-confirm-checkbox-cancel,
diff --git a/extension/js/common/core/types/openpgp.d.ts b/extension/js/common/core/types/openpgp.d.ts
index 6b4e89d87b8..a4dd3e15446 100644
--- a/extension/js/common/core/types/openpgp.d.ts
+++ b/extension/js/common/core/types/openpgp.d.ts
@@ -193,6 +193,7 @@ declare namespace OpenPGP {
     export class Userid extends BasePacket {
       public tag: enums.packet.userid;
       public userid: string;
+      public email: string;
     }
 
     export class SecretSubkey extends BaseKeyPacket {
diff --git a/extension/js/common/platform/store/acct-store.ts b/extension/js/common/platform/store/acct-store.ts
index 98bd73b635d..49478562dc1 100644
--- a/extension/js/common/platform/store/acct-store.ts
+++ b/extension/js/common/platform/store/acct-store.ts
@@ -31,7 +31,7 @@ export type AccountIndex = 'keys' | 'notification_setup_needed_dismissed' | 'ema
   'google_token_refresh' | 'hide_message_password' | 'sendAs' |
   'pubkey_sent_to' | 'full_name' | 'cryptup_enabled' | 'setup_done' |
   'successfully_received_at_leat_one_message' | 'notification_setup_done_seen' | 'picture' |
-  'outgoing_language' | 'setup_date' | 'openid' | 'tmp_submit_main' | 'tmp_submit_all' | 'uuid' | 'use_rich_text' | 'rules' |
+  'outgoing_language' | 'setup_date' | 'openid' | 'uuid' | 'use_rich_text' | 'rules' |
   'fesUrl' | 'fesAccessToken';
 
 export type SendAsAlias = {
@@ -67,9 +67,6 @@ export type AcctStoreDict = {
   rules?: DomainRulesJson;
   fesUrl?: string; // url where FlowCrypt Enterprise Server is deployed
   fesAccessToken?: string;
-  // temporary
-  tmp_submit_main?: boolean;
-  tmp_submit_all?: boolean;
 };
 
 /**
diff --git a/extension/js/common/ui/key-import-ui.ts b/extension/js/common/ui/key-import-ui.ts
index 38b316d1997..ec9e695e5dd 100644
--- a/extension/js/common/ui/key-import-ui.ts
+++ b/extension/js/common/ui/key-import-ui.ts
@@ -52,6 +52,14 @@ export class KeyImportUi {
     return;
   }
 
+  public static addAliasForSubmission = (email: string, submitKeyForAddrs: string[]) => {
+    submitKeyForAddrs.push(email);
+  }
+
+  public static removeAliasFromSubmission = (email: string, submitKeyForAddrs: string[]) => {
+    submitKeyForAddrs.splice(submitKeyForAddrs.indexOf(email), 1);
+  }
+
   constructor(o: { rejectKnown?: boolean, checkEncryption?: boolean, checkSigning?: boolean }) {
     this.rejectKnown = o.rejectKnown === true;
     this.checkEncryption = o.checkEncryption === true;
@@ -59,7 +67,7 @@ export class KeyImportUi {
   }
   public onBadPassphrase: VoidCallback = () => undefined;
 
-  public initPrvImportSrcForm = (acctEmail: string, parentTabId: string | undefined) => {
+  public initPrvImportSrcForm = (acctEmail: string, parentTabId: string | undefined, submitKeyForAddrs?: string[] | undefined) => {
     $('input[type=radio][name=source]').off().change(function () {
       if ((this as HTMLInputElement).value === 'file') {
         $('.input_private_key').val('').change().prop('disabled', true);
@@ -79,9 +87,28 @@ export class KeyImportUi {
       $('.input_passphrase').attr('type', 'text');
       $('#e_rememberPassphrase').prop('checked', true);
     }));
+    $('.input_private_key').on('keyup paste change', Ui.event.handle(async target => {
+      $('.action_add_private_key').addClass('btn_disabled').attr('disabled');
+      $('.input_email_alias').prop('checked', false);
+      const { keys: [prv] } = await opgp.key.readArmored(String($(target).val()));
+      if (prv !== undefined) {
+        $('.action_add_private_key').removeClass('btn_disabled').removeAttr('disabled');
+        if (submitKeyForAddrs !== undefined) {
+          const users = prv.users;
+          for (const user of users) {
+            const userId = user.userId;
+            for (const inputCheckboxesWithEmail of $('.input_email_alias')) {
+              if (String($(inputCheckboxesWithEmail).data('email')) === userId!.email) {
+                KeyImportUi.addAliasForSubmission(userId!.email, submitKeyForAddrs!);
+                $(inputCheckboxesWithEmail).prop('checked', true);
+              }
+            }
+          }
+        }
+      }
+    }));
     $('.input_private_key').change(Ui.event.handle(async target => {
       const { keys: [prv] } = await opgp.key.readArmored(String($(target).val()));
-      $('.input_passphrase').val('');
       if (!prv || !prv.isPrivate()) {
         $('.line.unprotected_key_create_pass_phrase').hide();
         return;
diff --git a/test/samples/openpgp/multialiaseduserexamplecom-0x357B908F62498DF8.key b/test/samples/openpgp/multialiaseduserexamplecom-0x357B908F62498DF8.key
new file mode 100644
index 00000000000..070ce382ce7
Binary files /dev/null and b/test/samples/openpgp/multialiaseduserexamplecom-0x357B908F62498DF8.key differ
diff --git a/test/source/browser/controllable.ts b/test/source/browser/controllable.ts
index d89639973da..fb32213ea8d 100644
--- a/test/source/browser/controllable.ts
+++ b/test/source/browser/controllable.ts
@@ -475,8 +475,8 @@ abstract class ControllableBase {
     } else if (m = customSelLanguageQuery.match(/@(ui-modal-[a-z\-]+)/)) { // tslint:disable-line:no-conditional-assignment
       return `.${m[1]}`; // represented as a class
       // eslint-disable-next-line no-cond-assign
-    } else if (m = customSelLanguageQuery.match(/^@([a-z0-9\-_]+)$/i)) { // tslint:disable-line:no-conditional-assignment
-      return `[data-test="${m[1]}"]`;
+    } else if (m = customSelLanguageQuery.match(/@([a-z0-9\-_]+)$/i)) { // tslint:disable-line:no-conditional-assignment
+      return customSelLanguageQuery.replace(/@([a-z0-9\-_]+)$/i, `[data-test="${m[1]}"]`);
       // eslint-disable-next-line no-cond-assign
     } else if (m = customSelLanguageQuery.match(/^@([a-z0-9\-_]+)\(([^()]*)\)$/i)) { // tslint:disable-line:no-conditional-assignment
       return `//*[@data-test='${m[1]}' and contains(text(),'${m[2]}')]`;
diff --git a/test/source/mock/attester/attester-endpoints.ts b/test/source/mock/attester/attester-endpoints.ts
index dae8446dfca..360bc02b964 100644
--- a/test/source/mock/attester/attester-endpoints.ts
+++ b/test/source/mock/attester/attester-endpoints.ts
@@ -22,6 +22,7 @@ const knownMockEmails = [
 ];
 
 let data: GoogleData;
+export const MOCK_ATTESTER_LAST_INSERTED_PUB: { [email: string]: string } = {};
 
 const getDC26454AFB71D18EABBAD73D1C7E6D3C5563A941 = async () => {
   if (!data) {
@@ -80,6 +81,7 @@ export const mockAttesterEndpoints: HandlersDefinition = {
     } else if (isPost(req)) {
       oauth.checkAuthorizationHeaderWithIdToken(req.headers.authorization);
       expect(body).to.contain('-----BEGIN PGP PUBLIC KEY BLOCK-----');
+      MOCK_ATTESTER_LAST_INSERTED_PUB[emailOrLongid] = body as string;
       return 'Saved'; // 200 OK
     } else {
       throw new HttpClientErr(`Not implemented: ${req.method}`);
@@ -95,6 +97,7 @@ export const mockAttesterEndpoints: HandlersDefinition = {
     if (email === 'no.pub@org-rules-test.flowcrypt.test') {
       throw new HttpClientErr(`Could not find LDAP pubkey on a LDAP-only domain for email ${email} on server keys.flowcrypt.test`);
     }
+    MOCK_ATTESTER_LAST_INSERTED_PUB[email] = pubkey;
     return { saved: true };
   },
   '/attester/test/welcome': async ({ body }, req) => {
diff --git a/test/source/mock/google/google-endpoints.ts b/test/source/mock/google/google-endpoints.ts
index c61fab9df64..1f90a310ce6 100644
--- a/test/source/mock/google/google-endpoints.ts
+++ b/test/source/mock/google/google-endpoints.ts
@@ -111,6 +111,28 @@ export const mockGoogleEndpoints: HandlersDefinition = {
           treatAsAlias: false,
           verificationStatus: 'accepted'
         });
+      } else if (acct === 'multi.aliased.user@example.com') {
+        const alias1 = 'alias1@example.com';
+        const alias2 = 'alias2@example.com';
+        sendAs.push({
+          sendAsEmail: alias1,
+          displayName: 'An Alias1',
+          replyToAddress: alias1,
+          signature: '',
+          isDefault: false,
+          isPrimary: false,
+          treatAsAlias: false,
+          verificationStatus: 'accepted'
+        }, {
+          sendAsEmail: alias2,
+          displayName: 'An Alias1',
+          replyToAddress: alias2,
+          signature: '',
+          isDefault: false,
+          isPrimary: false,
+          treatAsAlias: false,
+          verificationStatus: 'accepted'
+        });
       }
       return { sendAs };
     }
diff --git a/test/source/tests/page-recipe/setup-page-recipe.ts b/test/source/tests/page-recipe/setup-page-recipe.ts
index f6eca020b75..aed43253d47 100644
--- a/test/source/tests/page-recipe/setup-page-recipe.ts
+++ b/test/source/tests/page-recipe/setup-page-recipe.ts
@@ -19,8 +19,9 @@ type ManualEnterOpts = {
   enforceAttesterSubmitOrgRule?: boolean,
   noPubSubmitRule?: boolean,
   fillOnly?: boolean,
-  key?: TestKeyInfoWithFilepath,
   isInvalidKey?: boolean | undefined,
+  checkEmailAliasIfPresent?: boolean,
+  key?: { title: string, passphrase: string, armored: string | null, longid: string | null, filePath?: string }
 };
 
 type CreateKeyOpts = {
@@ -29,6 +30,8 @@ type CreateKeyOpts = {
   submitPubkey?: boolean,
   enforcedAlgo?: string | boolean,
   selectKeyAlgo?: string,
+  skipForPassphrase?: boolean,
+  pageEvaluator?: () => void
 };
 
 export class SetupPageRecipe extends PageRecipe {
@@ -37,10 +40,10 @@ export class SetupPageRecipe extends PageRecipe {
     settingsPage: ControllablePage,
     keyTitle: string,
     backup: 'none' | 'email' | 'file' | 'disabled',
-    { usedPgpBefore = false, submitPubkey = false, enforcedAlgo = false, selectKeyAlgo = '', key }: CreateKeyOpts = {},
+    { usedPgpBefore = false, submitPubkey = false, enforcedAlgo = false, selectKeyAlgo = '', skipForPassphrase = false, pageEvaluator, key }: CreateKeyOpts = {},
     checks: SavePassphraseChecks = {}
   ) => {
-    await SetupPageRecipe.createBegin(settingsPage, keyTitle, { key, usedPgpBefore });
+    await SetupPageRecipe.createBegin(settingsPage, keyTitle, { key, usedPgpBefore, skipForPassphrase });
     if (enforcedAlgo) {
       expect(await settingsPage.value('@input-step2bmanualcreate-key-type')).to.equal(enforcedAlgo);
       expect(await settingsPage.isDisabled('@input-step2bmanualcreate-key-type')).to.equal(true);
@@ -56,6 +59,9 @@ export class SetupPageRecipe extends PageRecipe {
     if (!submitPubkey && await settingsPage.isElementPresent('@input-step2bmanualcreate-submit-pubkey')) {
       await settingsPage.waitAndClick('@input-step2bmanualcreate-submit-pubkey'); // uncheck
     }
+    if (pageEvaluator !== undefined) {
+      pageEvaluator();
+    }
     if (checks.isSavePassphraseHidden !== undefined) {
       expect(await settingsPage.hasClass('@input-step2bmanualcreate-save-passphrase-label', 'hidden')).to.equal(checks.isSavePassphraseHidden);
     }
@@ -280,12 +286,20 @@ export class SetupPageRecipe extends PageRecipe {
     await SettingsPageRecipe.ready(settingsPage);
   };
 
-  private static createBegin = async (settingsPage: ControllablePage, keyTitle: string, { key, usedPgpBefore = false }: { key?: { passphrase: string }, usedPgpBefore?: boolean } = {}) => {
+  // eslint-disable-next-line max-len
+  private static createBegin = async (settingsPage: ControllablePage, keyTitle: string, { key, usedPgpBefore = false, skipForPassphrase = false }: { key?: { passphrase: string }, usedPgpBefore?: boolean, skipForPassphrase?: boolean } = {}) => {
     const k = key || Config.key(keyTitle);
     if (usedPgpBefore) {
       await settingsPage.waitAndClick('@action-step0foundkey-choose-manual-create', { timeout: 30 });
     } else {
-      await settingsPage.waitAndClick('@action-step1easyormanual-choose-manual-create', { timeout: 30, retryErrs: true });
+      if (skipForPassphrase) {
+        await settingsPage.waitAndClick('#lost_pass_phrase');
+        await settingsPage.waitAndClick('.action_skip_recovery');
+        await settingsPage.waitAndRespondToModal('confirm', 'confirm', 'Your account will be set up for encryption again, but your previous encrypted emails will be unreadable.');
+        await settingsPage.waitAndClick('@action-step1easyormanual-choose-manual-create', { timeout: 30, retryErrs: true });
+      } else {
+        await settingsPage.waitAndClick('@action-step1easyormanual-choose-manual-create', { timeout: 30, retryErrs: true });
+      }
     }
     await settingsPage.waitAndType('@input-step2bmanualcreate-passphrase-1', k.passphrase);
     await settingsPage.waitAndType('@input-step2bmanualcreate-passphrase-2', k.passphrase);
diff --git a/test/source/tests/setup.ts b/test/source/tests/setup.ts
index 1ee0360a6de..99df2d1ca3e 100644
--- a/test/source/tests/setup.ts
+++ b/test/source/tests/setup.ts
@@ -10,6 +10,7 @@ import { SettingsPageRecipe } from './page-recipe/settings-page-recipe';
 import { ComposePageRecipe } from './page-recipe/compose-page-recipe';
 import { Str } from './../core/common';
 import { MOCK_KM_LAST_INSERTED_KEY } from './../mock/key-manager/key-manager-endpoints';
+import { MOCK_ATTESTER_LAST_INSERTED_PUB } from './../mock/attester/attester-endpoints';
 import { BrowserRecipe } from './tooling/browser-recipe';
 import { KeyInfo, KeyUtil } from '../core/crypto/key';
 import { testConstants } from './tooling/consts';
@@ -38,6 +39,30 @@ export const defineSetupTests = (testVariant: TestVariant, testWithBrowser: Test
       await settingsPage.notPresent('.settings-banner');
     }));
 
+    ava.default('setup - optional checkbox for each email aliases', testWithBrowser(undefined, async (t, browser) => {
+      const settingsPage = await BrowserRecipe.openSettingsLoginApprove(t, browser, 'flowcrypt.compatibility@gmail.com');
+      await Util.sleep(5);
+      await SetupPageRecipe.createKey(
+        settingsPage,
+        'unused',
+        'none',
+        {
+          key: { passphrase: 'long enough to suit requirements' },
+          usedPgpBefore: false,
+          skipForPassphrase: true,
+          submitPubkey: true,
+          pageEvaluator: async () => {
+            expect(await settingsPage.isChecked('@input-email-alias-flowcryptcompatibilitygmailcom')).to.equal(false); // unchecked by default
+            await settingsPage.clickIfPresent('@input-email-alias-flowcryptcompatibilitygmailcom'); // include by the user (simulated)
+            await settingsPage.waitAndClick('@input-step2bmanualcreate-create-and-save');
+          }
+        }
+      );
+      expect(MOCK_ATTESTER_LAST_INSERTED_PUB['flowcrypt.compatibility@gmail.com']).not.to.be.an('undefined');
+      expect(MOCK_ATTESTER_LAST_INSERTED_PUB['flowcryptcompatibility@gmail.com']).not.to.be.an('undefined');
+      await settingsPage.close();
+    }));
+
     ava.default('setup - import key - do not submit - did not use before', testWithBrowser(undefined, async (t, browser) => {
       const settingsPage = await BrowserRecipe.openSettingsLoginApprove(t, browser, 'flowcrypt.test.key.imported@gmail.com');
       await SetupPageRecipe.manualEnter(settingsPage, 'flowcrypt.test.key.used.pgp', { submitPubkey: false, usedPgpBefore: false },
@@ -112,7 +137,6 @@ export const defineSetupTests = (testVariant: TestVariant, testWithBrowser: Test
         key: {
           title: 'UIDless key',
           armored: `-----BEGIN PGP PRIVATE KEY BLOCK-----
-
 xcMFBF8/lc8BCACwwWWyNdfZ9Qjz8zc4sFGNfHXITscT7WCMuXgC2BbFwiSD
 52+Z6fIKaaMFP07MOy8g3PsrW8rrM6j9ew4fh6Kr6taD5JtZfWEWxSnmfl8T
 MqbfcGklJZDyqbSlRBHh53ea4fZe/wCiaL2qhME9Pa7M+w/AiCT1LuXUBiKp
@@ -716,4 +740,48 @@ AN8G3r5Htj8olot+jm9mIa5XLXWzMNUZgg==
 
   }
 
+  if (testVariant === 'CONSUMER-MOCK') {
+    ava.default('setup - imported key with multiple alias should show checkbox per alias', testWithBrowser(undefined, async (t, browser) => {
+      expect((await KeyUtil.parse(testConstants.keyMultiAliasedUser)).emails.length).to.equals(3);
+      const settingsPage = await BrowserRecipe.openSettingsLoginApprove(t, browser, 'multi.aliased.user@example.com');
+      await SetupPageRecipe.manualEnter(settingsPage, '', {
+        submitPubkey: true, fillOnly: true, checkEmailAliasIfPresent: true, key: {
+          title: 'multi.aliased.user@example.com',
+          passphrase: '1basic passphrase to use',
+          armored: testConstants.keyMultiAliasedUser,
+          longid: null // tslint:disable-line:no-null-keyword
+        }
+      }, { isSavePassphraseChecked: false, isSavePassphraseHidden: false });
+      expect(await settingsPage.isChecked('.container_for_import_key_email_alias @input-email-alias-alias1examplecom')).to.equal(true);
+      expect(await settingsPage.isChecked('.container_for_import_key_email_alias @input-email-alias-alias2examplecom')).to.equal(true);
+      await settingsPage.close();
+    }));
+
+    ava.default('setup - imported key from a file with multiple alias', testWithBrowser(undefined, async (t, browser) => {
+      const settingsPage = await BrowserRecipe.openSettingsLoginApprove(t, browser, 'multi.aliased.user@example.com');
+      const key = {
+        title: 'unarmored OpenPGP key',
+        filePath: 'test/samples/openpgp/multialiaseduserexamplecom-0x357B908F62498DF8.key',
+        armored: null, // tslint:disable-line:no-null-keyword
+        passphrase: '1basic passphrase to use',
+        longid: null // tslint:disable-line:no-null-keyword
+      };
+      await SetupPageRecipe.manualEnter(settingsPage, key.title, { submitPubkey: true, fillOnly: true, key });
+      expect(await settingsPage.isChecked('.container_for_import_key_email_alias @input-email-alias-alias1examplecom')).to.equal(true);
+      expect(await settingsPage.isChecked('.container_for_import_key_email_alias @input-email-alias-alias2examplecom')).to.equal(true);
+      /* simulate several clicks then exclude alias2@example.com from submitting key from the attester */
+      await settingsPage.waitAndClick('.container_for_import_key_email_alias @input-email-alias-alias1examplecom'); // uncheck
+      await settingsPage.waitAndClick('.container_for_import_key_email_alias @input-email-alias-alias1examplecom'); // check
+      await settingsPage.waitAndClick('.container_for_import_key_email_alias @input-email-alias-alias2examplecom'); // uncheck
+      await settingsPage.waitAndClick('.container_for_import_key_email_alias @input-email-alias-alias2examplecom'); // check
+      await settingsPage.waitAndClick('.container_for_import_key_email_alias @input-email-alias-alias2examplecom'); // finally uncheck
+      await settingsPage.waitAndClick('@input-step2bmanualenter-save', { delay: 1 });
+      await settingsPage.waitAndClick('@action-step4done-account-settings');
+      expect(MOCK_ATTESTER_LAST_INSERTED_PUB['multi.aliased.user@example.com']).not.to.be.an('undefined');
+      expect(MOCK_ATTESTER_LAST_INSERTED_PUB['alias1@example.com']).not.to.be.an('undefined');
+      expect(MOCK_ATTESTER_LAST_INSERTED_PUB['alias2@example.com']).to.be.an('undefined');
+      await settingsPage.close();
+    }));
+  }
+
 };
diff --git a/test/source/tests/tooling/consts.ts b/test/source/tests/tooling/consts.ts
index 206a53806aa..c3a1431faf0 100644
--- a/test/source/tests/tooling/consts.ts
+++ b/test/source/tests/tooling/consts.ts
@@ -1188,6 +1188,34 @@ AMUyfkuN79w+/Pph1Dj13OHsVT5bjVgM5nZUK02hruuxPVW4pWxik0VSIy1ETQ/rdHaV0MkG0dPe
 pPZmGgpvIsM7dzBQyot16wRBnLvqozCkvGolPDP7vZPVHQ3JthUu67jy3Yb79WUNPqU4EfS4TIks
 v1r84mE7hnWXat1k6lo2yp65Eg==
 =8Ruj
+-----END PGP PRIVATE KEY BLOCK-----`,
+  // Primary User: multi.aliased.user@example.com
+  // Additional UID: alias1@example.com
+  // Additional UID: alias2@example.com
+  keyMultiAliasedUser: `-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+lIYEYUQXshYJKwYBBAHaRw8BAQdA/G92pV0XGodw/FpNPQFZ2KhKroAgnEyFAKkE
+VFWAlRT+BwMC6rPF2ApelL37gjffdv4PvNwSsR3IGLJEHUaP8lRLXHR5vQb4WKdF
+iYc7hlDPeNiwwGZrMr1yyXnTyT8I8JvhJ6eGxzK1nyeXFnUiGJ3h3bQxTXVsdGlB
+bGlhc2VkVXNlciA8bXVsdGkuYWxpYXNlZC51c2VyQGV4YW1wbGUuY29tPoiaBBMW
+CgBCFiEEvesgYet7WLPYq2iRNXuQj2JJjfgFAmFEF7ICGwMFCQPCZwAFCwkIBwID
+IgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEDV7kI9iSY34WckA/0hrsxdOCeNaycey
+f/wZo2DGJhCA4Ml6GVp/E2vrTsSEAQDXj/QlHRskEMK/iRG66OYFzKyVCuNx+Q9s
+L/L4wfOYCrQbQWxpYXMxIDxhbGlhczFAZXhhbXBsZS5jb20+iJoEExYKAEIWIQS9
+6yBh63tYs9iraJE1e5CPYkmN+AUCYUQYKAIbAwUJA8JnAAULCQgHAgMiAgEGFQoJ
+CAsCBBYCAwECHgcCF4AACgkQNXuQj2JJjfhR/AEAgpcXky8kEO6AkT8W5h3aY6b3
+38AfGMjISmHrF5md8k0A/0Aruab2Y50ib7aOap6zny1g6wFotPCENQNOldgWGeIF
+tBtBbGlhczIgPGFsaWFzMkBleGFtcGxlLmNvbT6ImgQTFgoAQhYhBL3rIGHre1iz
+2KtokTV7kI9iSY34BQJhRBg/AhsDBQkDwmcABQsJCAcCAyICAQYVCgkICwIEFgID
+AQIeBwIXgAAKCRA1e5CPYkmN+OV0AP4kTl6C/4qVyyTVaaBdIxadnEtrjdeemkzf
+kYgd0HliPwD+NUH47NTahextbyW9U/EqHUug2E7aT5+kd10ohJik4QGciwRhRBey
+EgorBgEEAZdVAQUBAQdAr3z6JxBC59mQNnWooEKKLfcBlUtwkhd9anBE+slGiQwD
+AQgH/gcDArrtgLvx8QT2+492UkU1F6oyxu4F5vSOF+XTWxN5cucxL4ANE0hNOpI/
+n1VT47pVFd6BOye6vYRi8Ll4KiplzAfoVcfO4rXncgW+QmHssOCIfgQYFgoAJhYh
+BL3rIGHre1iz2KtokTV7kI9iSY34BQJhRBeyAhsMBQkDwmcAAAoJEDV7kI9iSY34
+UAoBAPsAbbNjSdrbIaz+tLYlsArQcfzQBxwQNpvaOLUJjpybAP48+X5ZOSww91BH
+9SD7Qpy7QR0FD0I0+qMeKZZXnvwPBA==
+=E6KI
 -----END PGP PRIVATE KEY BLOCK-----`,
   // Primary User: flowcrypt.compatibility@gmail.com
   // Fingerprint: 501D F7A2 2898 667D EA67  F053 07A6 AC92 17AD 7D07