diff --git a/web/src/invite.ts b/web/src/invite.ts
index 81ca4e0edc..dd41ee3577 100644
--- a/web/src/invite.ts
+++ b/web/src/invite.ts
@@ -444,9 +444,10 @@ function open_invite_user_modal(e: JQuery.ClickEvent<Document, undefined>): void
             const $button = $("#invite-user-modal .dialog_submit_button");
             $button.prop(
                 "disabled",
-                (selected_tab === "invite-email-tab" &&
-                    email_pill_widget.items().length === 0 &&
-                    email_pill.get_current_email(email_pill_widget) === null) ||
+                !user_has_email_set ||
+                    (selected_tab === "invite-email-tab" &&
+                        email_pill_widget.items().length === 0 &&
+                        email_pill.get_current_email(email_pill_widget) === null) ||
                     ($expires_in.val() === "custom" && !valid_custom_time),
             );
             if (selected_tab === "invite-email-tab") {
diff --git a/web/styles/app_variables.css b/web/styles/app_variables.css
index 377eeee3ee..77359355d1 100644
--- a/web/styles/app_variables.css
+++ b/web/styles/app_variables.css
@@ -1852,6 +1852,10 @@
         hsl(0deg 0% 100%),
         hsl(0deg 0% 0% / 20%)
     );
+    --color-background-pill-container-input-disabled: light-dark(
+        hsl(0deg 0% 93%),
+        hsl(0deg 0% 0% / 20%)
+    );
 
     /* Inbox view constants - Values from Figma design */
     --height-inbox-search: 1.8571em; /* 26px / 14px em */
diff --git a/web/styles/input_pill.css b/web/styles/input_pill.css
index 609ec63ac7..7a42d5b568 100644
--- a/web/styles/input_pill.css
+++ b/web/styles/input_pill.css
@@ -240,6 +240,11 @@
     );
 }
 
+#invitee_emails_container .pill-container.not-editable-by-user {
+    height: var(--height-input-pill);
+    background-color: var(--color-background-pill-container-input-disabled);
+}
+
 .add_subscribers_container .pill-container,
 .add_streams_container .pill-container,
 .add-user-group-container .pill-container,
diff --git a/web/templates/invite_user_modal.hbs b/web/templates/invite_user_modal.hbs
index e60f381cbb..479be1cf52 100644
--- a/web/templates/invite_user_modal.hbs
+++ b/web/templates/invite_user_modal.hbs
@@ -15,8 +15,8 @@
         <div id="invite_users_option_tabs_container"></div>
         <div id="invitee_emails_container">
             <label for="invitee_emails" class="modal-field-label">{{t "Emails (one on each line or comma-separated)" }}</label>
-            <div class="pill-container">
-                <div class="input" contenteditable="true"></div>
+            <div class="pill-container {{#unless user_has_email_set}}not-editable-by-user{{/unless}}">
+                <div class="input" {{#if user_has_email_set}}contenteditable="true"{{/if}}></div>
             </div>
         </div>
     </div>