diff --git a/Plugins/CorvusEbMS.Admin/src/main/java/hk/hku/cecid/ebms/admin/listener/AgreementUploadPageletAdaptor.java b/Plugins/CorvusEbMS.Admin/src/main/java/hk/hku/cecid/ebms/admin/listener/AgreementUploadPageletAdaptor.java
index c3a127d..b728658 100755
--- a/Plugins/CorvusEbMS.Admin/src/main/java/hk/hku/cecid/ebms/admin/listener/AgreementUploadPageletAdaptor.java
+++ b/Plugins/CorvusEbMS.Admin/src/main/java/hk/hku/cecid/ebms/admin/listener/AgreementUploadPageletAdaptor.java
@@ -206,7 +206,7 @@ private PartnershipDVO createPartnership(CollaborationProtocolAgreement cpa, Del
 
         String action = senderActionBinding.getAction();
 
-        partnershipDVO.setPartnershipId(cpa.getCpaid() + "," + channel.getChannelId() + "," + action);
+        partnershipDVO.setPartnershipId(cpa.getCpaid() + "," + channel.getChannelId() + "," + serviceName.replaceAll(" ", "") + "," + action);
         partnershipDVO.setCpaId(cpa.getCpaid());
         partnershipDVO.setService(serviceName);
         partnershipDVO.setAction(action);