diff --git a/src/main/java/com/eactive/apim/portal/invitation/event/UserInvitationEvent.java b/src/main/java/com/eactive/apim/portal/invitation/event/UserInvitationEvent.java
index ab59632..ecf3455 100644
--- a/src/main/java/com/eactive/apim/portal/invitation/event/UserInvitationEvent.java
+++ b/src/main/java/com/eactive/apim/portal/invitation/event/UserInvitationEvent.java
@@ -21,10 +21,11 @@ public class UserInvitationEvent implements MessageEventHandler {
     @Override
     public MessageSendEvent createEvent(Object source, MessageRecipient recipient, Map<String, Object> params) {
         Map<String, String> requestParams = new HashMap<>();
-        requestParams.put("company", params.get("company").toString());
-        requestParams.put("manager", params.get("manager").toString());
+        requestParams.put("corpName", params.get("corpName").toString());
+        requestParams.put("managerName", params.get("managerName").toString());
         requestParams.put("url", params.get("url").toString());
-        requestParams.put("userName",params.get("company").toString() + " 이용자");
+        requestParams.put("loginId",params.get("corpName").toString() + " 이용자");
+        requestParams.put("authNumber", params.get("authNumber").toString());
         return new MessageSendEvent(source, KEY, recipient, requestParams);
     }
 
diff --git a/src/main/java/com/eactive/apim/portal/invitation/repository/UserInvitationRepository.java b/src/main/java/com/eactive/apim/portal/invitation/repository/UserInvitationRepository.java
index e9c0f4b..f79fe17 100644
--- a/src/main/java/com/eactive/apim/portal/invitation/repository/UserInvitationRepository.java
+++ b/src/main/java/com/eactive/apim/portal/invitation/repository/UserInvitationRepository.java
@@ -18,4 +18,8 @@ public interface UserInvitationRepository extends JpaRepository<UserInvitation,
     List<UserInvitation> findByStatus(InvitationStatus status);
 
     Optional<UserInvitation> findFirstByInvitationEmailAndStatus(String email, InvitationStatus status);
+
+    Optional<UserInvitation> findFirstByInvitationEmailAndOrgIdAndStatus(String email, String orgId, InvitationStatus status);
+
+    Optional<UserInvitation> findFirstByInvitationEmailAndOrgId(String email, String orgId);
 }