diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java
index ec5199ee77..a3b6ab6fb7 100644
--- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java
+++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java
@@ -73,4 +73,9 @@ public interface OrganizationMembersResource {
 
     @Path("{id}")
     OrganizationMemberResource member(@PathParam("id") String id);
+
+    @POST
+    @Path("invite")
+    @Consumes(MediaType.APPLICATION_JSON)
+    Response inviteMember(UserRepresentation rep);
 }
diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/inviteorg/InviteOrgActionToken.java b/services/src/main/java/org/keycloak/authentication/actiontoken/inviteorg/InviteOrgActionToken.java
index b09daa8aca..d93163672d 100644
--- a/services/src/main/java/org/keycloak/authentication/actiontoken/inviteorg/InviteOrgActionToken.java
+++ b/services/src/main/java/org/keycloak/authentication/actiontoken/inviteorg/InviteOrgActionToken.java
@@ -27,7 +27,7 @@ import org.keycloak.models.Constants;
  */
 public class InviteOrgActionToken extends DefaultActionToken {
 
-    public static final String TOKEN_TYPE = "invite-org";
+    public static final String TOKEN_TYPE = "ORGIVT";
 
     private static final String JSON_FIELD_REDIRECT_URI = "reduri";
     private static final String JSON_ORG_ID = "org_id";
diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/inviteorg/InviteOrgActionTokenHandler.java b/services/src/main/java/org/keycloak/authentication/actiontoken/inviteorg/InviteOrgActionTokenHandler.java
index b07b63afe8..50ebc2276e 100644
--- a/services/src/main/java/org/keycloak/authentication/actiontoken/inviteorg/InviteOrgActionTokenHandler.java
+++ b/services/src/main/java/org/keycloak/authentication/actiontoken/inviteorg/InviteOrgActionTokenHandler.java
@@ -133,9 +133,4 @@ public class InviteOrgActionTokenHandler extends AbstractActionTokenHandler<Invi
         String nextAction = AuthenticationManager.nextRequiredAction(session, authSession, tokenContext.getRequest(), event);
         return AuthenticationManager.redirectToRequiredActions(session, realm, authSession, uriInfo, nextAction);
     }
-
-    private boolean isVerifyEmailActionSet(UserModel user, AuthenticationSessionModel authSession) {
-        return Stream.concat(user.getRequiredActionsStream(), authSession.getRequiredActions().stream())
-                .anyMatch(RequiredAction.VERIFY_EMAIL.name()::equals);
-    }
 }
diff --git a/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationMemberResource.java b/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationMemberResource.java
index cc46b6a887..e7aac33399 100644
--- a/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationMemberResource.java
+++ b/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationMemberResource.java
@@ -39,6 +39,7 @@ import java.util.Objects;
 
 import org.eclipse.microprofile.openapi.annotations.Operation;
 import org.eclipse.microprofile.openapi.annotations.parameters.Parameter;
+import org.keycloak.common.util.Time;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.ModelException;
 import org.keycloak.models.OrganizationModel;
@@ -117,30 +118,32 @@ public class OrganizationMemberResource {
     @Path("invite")
     @Consumes(MediaType.APPLICATION_JSON)
     public Response inviteMember(UserRepresentation rep) {
-        if (rep == null || StringUtil.isBlank(rep.getEmail()) || StringUtil.isBlank(rep.getUsername())) {
+        if (rep == null || StringUtil.isBlank(rep.getEmail())) {
             throw new BadRequestException("To invite a member you need to provide an email and/or username");
         }
 
-        UserModel user = session.users().getUserByUsername(realm, rep.getEmail());
+        UserModel user = session.users().getUserByEmail(realm, rep.getEmail());
 
         InviteOrgActionToken token = null;
         // TODO not sure if this client id is right or if we should get one from the user somehow...
         // TODO not really sure if the token is getting signed so we need to figure out where that's happening... maybe in the serialize method?
         // TODO the expiration is set to a day in seconds but we should probably get this from configuration instead
         String link = null;
+        int tokenExpiration = Time.currentTime() + realm.getActionTokenGeneratedByAdminLifespan();
         if (user != null) {
-           token = new InviteOrgActionToken(user.getId(), 86400, user.getEmail(), session.getContext().getClient().getClientId());
+           token = new InviteOrgActionToken(user.getId(), tokenExpiration, user.getEmail(), Constants.ACCOUNT_MANAGEMENT_CLIENT_ID);
+           token.setOrgId(organization.getId());
            link = LoginActionsService.actionTokenProcessor(session.getContext().getUri())
                    .queryParam("key", token.serialize(session, realm, session.getContext().getUri()))
                    .build(realm.getName()).toString();
         } else {
             // this path lets us invite a user that doesn't exist yet, letting them register into the organization
-            token = new InviteOrgActionToken(null, 86400, rep.getEmail(), session.getContext().getClient().getClientId());
+            token = new InviteOrgActionToken(null, tokenExpiration, rep.getEmail(), session.getContext().getClient().getClientId());
+            token.setOrgId(organization.getId());
             link = LoginActionsService.registrationFormProcessor(session.getContext().getUri())
                     .queryParam(Constants.ORG_TOKEN, token.serialize(session, realm, session.getContext().getUri()))
                     .build(realm.getName()).toString();
         }
-        token.setOrgId(organization.getId());
 
         try {
             session
diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/InfoPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/InfoPage.java
index 3f80376e79..032717a9d9 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/InfoPage.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/InfoPage.java
@@ -40,6 +40,9 @@ public class InfoPage extends LanguageComboboxAwarePage {
     @FindBy(linkText = "» Klicken Sie hier um fortzufahren")
     private WebElement clickToContinueDe;
 
+    @FindBy(linkText = "» Click here to proceed")
+    private WebElement clickToContinue;
+
     @FindBy(linkText = "« Zpět na aplikaci")
     private WebElement backToApplicationCs;
 
@@ -65,6 +68,10 @@ public class InfoPage extends LanguageComboboxAwarePage {
         clickToContinueDe.click();
     }
 
+    public void clickToContinue() {
+        clickToContinue.click();
+    }
+
     public void clickBackToApplicationLinkCs() {
         backToApplicationCs.click();
     }
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationInvitationLinkTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationInvitationLinkTest.java
new file mode 100755
index 0000000000..46b1ea918f
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationInvitationLinkTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2024 Red Hat, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.keycloak.testsuite.organization.admin;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
+
+import jakarta.mail.internet.MimeMessage;
+import jakarta.ws.rs.core.Response;
+import org.jboss.arquillian.graphene.page.Page;
+import org.junit.Rule;
+import org.junit.Test;
+import org.keycloak.admin.client.resource.OrganizationResource;
+import org.keycloak.common.Profile.Feature;
+import org.keycloak.representations.idm.RealmRepresentation;
+import org.keycloak.representations.idm.UserRepresentation;
+import org.keycloak.testsuite.Assert;
+import org.keycloak.testsuite.admin.ApiUtil;
+import org.keycloak.testsuite.arquillian.annotation.EnableFeature;
+import org.keycloak.testsuite.pages.InfoPage;
+import org.keycloak.testsuite.util.GreenMailRule;
+import org.keycloak.testsuite.util.MailUtils;
+import org.keycloak.testsuite.util.UserBuilder;
+
+@EnableFeature(Feature.ORGANIZATION)
+public class OrganizationInvitationLinkTest extends AbstractOrganizationTest {
+
+    @Rule
+    public GreenMailRule greenMail = new GreenMailRule();
+
+    @Page
+    protected InfoPage infoPage;
+
+    @Override
+    public void configureTestRealm(RealmRepresentation testRealm) {
+        Map<String, String> smtpConfig = testRealm.getSmtpServer();
+        super.configureTestRealm(testRealm);
+        testRealm.setSmtpServer(smtpConfig);
+    }
+
+    @Test
+    public void testInviteExistingUser() throws IOException {
+        UserRepresentation user = UserBuilder.create()
+                .username("invited")
+                .email("invited@myemail.com")
+                .password("password")
+                .enabled(true)
+                .build();
+        try (Response response = testRealm().users().create(user)) {
+            user.setId(ApiUtil.getCreatedId(response));
+        }
+
+        OrganizationResource organization = testRealm().organizations().get(createOrganization().getId());
+
+        organization.members().inviteMember(user).close();
+
+        MimeMessage message = greenMail.getLastReceivedMessage();
+        Assert.assertNotNull(message);
+        String link = MailUtils.getPasswordResetEmailLink(message);
+        driver.manage().timeouts().pageLoadTimeout(1, TimeUnit.DAYS);
+        driver.navigate().to(link.trim());
+        Assert.assertFalse(organization.members().getAll().stream().anyMatch(actual -> user.getId().equals(actual.getId())));
+        infoPage.clickToContinue();
+        assertThat(infoPage.getInfo(), containsString("Your account has been updated."));
+        Assert.assertTrue(organization.members().getAll().stream().anyMatch(actual -> user.getId().equals(actual.getId())));
+    }
+}
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/email/text/org-invite.ftl b/themes/src/main/resources/theme/base/email/text/org-invite.ftl
new file mode 100644
index 0000000000..afc32a7230
--- /dev/null
+++ b/themes/src/main/resources/theme/base/email/text/org-invite.ftl
@@ -0,0 +1,2 @@
+<#ftl output_format="plainText">
+${kcSanitize(msg("orgInviteBodyHtml", link, linkExpiration, realmName, linkExpirationFormatter(linkExpiration)))}