diff --git a/frontend/src/lib/i18n/locales/en.json b/frontend/src/lib/i18n/locales/en.json
index cb3e343cb..edb2ceb17 100644
--- a/frontend/src/lib/i18n/locales/en.json
+++ b/frontend/src/lib/i18n/locales/en.json
@@ -264,8 +264,7 @@ the [Linguistics Institute at Payap University](https://li.payap.ac.th/) in Chia
       "__comment_modal_title": "Should become 'Add or invite a Member ...' once email invitations implemented for orgs",
       "submit_button": "Add Member",
       "empty_user_field": "Please enter an email address or login",
-      "submit_button_email": "Add Member",
-      "__comment_submit_button_email": "Should become 'Add or invite Member' once email invitations implemented for orgs",
+      "submit_button_email": "Add/Invite Member",
       "org_not_found": "Organization not found. Please refresh the page.",
       "username_not_found": "No user was found with this login",
       "user_must_be_verified": "User needs a verified email address",
diff --git a/frontend/src/routes/(authenticated)/org/[org_id]/AddOrgMemberModal.svelte b/frontend/src/routes/(authenticated)/org/[org_id]/AddOrgMemberModal.svelte
index fde0d2867..985e7f86e 100644
--- a/frontend/src/routes/(authenticated)/org/[org_id]/AddOrgMemberModal.svelte
+++ b/frontend/src/routes/(authenticated)/org/[org_id]/AddOrgMemberModal.svelte
@@ -91,7 +91,7 @@
     />
   </svelte:fragment>
   <span slot="submitText">
-    {#if $form.usernameOrEmail.includes('@')}
+    {#if $form.canInvite && $form.usernameOrEmail.includes('@')}
       {$t('org_page.add_user.submit_button_email')}
     {:else}
       {$t('org_page.add_user.submit_button')}
diff --git a/frontend/src/routes/(authenticated)/project/[project_code]/AddProjectMember.svelte b/frontend/src/routes/(authenticated)/project/[project_code]/AddProjectMember.svelte
index 58dc3366f..4d0249557 100644
--- a/frontend/src/routes/(authenticated)/project/[project_code]/AddProjectMember.svelte
+++ b/frontend/src/routes/(authenticated)/project/[project_code]/AddProjectMember.svelte
@@ -98,7 +98,7 @@
     />
   </svelte:fragment>
   <span slot="submitText">
-    {#if $form.canInvite}
+    {#if $form.canInvite && $form.usernameOrEmail.includes('@')}
       {$t('project_page.add_user.submit_button_invite')}
     {:else}
       {$t('project_page.add_user.submit_button')}