diff --git a/src/docs/asciidoc/reference_doc/ui_api.adoc b/src/docs/asciidoc/reference_doc/ui_api.adoc
index ad64aca543..1feb12f928 100644
--- a/src/docs/asciidoc/reference_doc/ui_api.adoc
+++ b/src/docs/asciidoc/reference_doc/ui_api.adoc
@@ -138,7 +138,7 @@ To adapt the template content to the display context it is possible to get from
 
 ===  Function getEntitiesAllowedToRespond
 
-If inside your template, you want to get the ids of the entities allowed to send a response, you can call the method getEntitiesAllowedToRespond. This method returns an array containing the ids. An example of usage can be found in the file https://github.com/opfab/operatorfabric-core/tree/master/src/test/resources/bundles/messageOrQuestionExample/template/question.handlebars[src/test/resources/bundles/messageOrQuestionExample/template/question.handlebars].
+If inside your template, you want to get the ids of the entities allowed to send a response, you can call the method getEntitiesAllowedToRespond. This method returns an array containing the ids.
 
 ```
     const entities = opfab.currentCard.getEntitiesAllowedToRespond(); 
@@ -146,14 +146,22 @@ If inside your template, you want to get the ids of the entities allowed to send
 
 === Function  getEntityUsedForUserResponse
 
-If inside your template, you want to get the id of the entity used by the user to send a response, you can call the method getEntityUsedForUserResponse. 
-An example of usage can be found in the file https://github.com/opfab/operatorfabric-core/tree/master/src/test/resources/bundles/messageOrQuestionExample/template/question.handlebars[src/test/resources/bundles/messageOrQuestionExample/template/question.handlebars].
+If inside your template, you want to get the id of the entity used by the user to send a response, you can call the method getEntityUsedForUserResponse. This method is deprecated and you should favor the use of the method getEntitiesUsableForUserResponse.
 
 ```
     const entity = opfab.currentCard.getEntityUsedForUserResponse()
         
 ```
 
+=== Function  getEntitiesUsableForUserResponse
+
+If inside your template, you want to get the ids of the entities the user can answer on behalf of, you can call the method getEntitiesUsableForUserResponse. This method will return an array containing the entities' ids
+
+```
+    const entities = opfab.currentCard.getEntitiesUsableForUserResponse()
+        
+```
+
 
 === Function isResponseLocked
 
diff --git a/src/docs/asciidoc/resources/migration_guide_to_4.1.adoc b/src/docs/asciidoc/resources/migration_guide_to_4.1.adoc
index d8b340290b..9a1f25abaa 100644
--- a/src/docs/asciidoc/resources/migration_guide_to_4.1.adoc
+++ b/src/docs/asciidoc/resources/migration_guide_to_4.1.adoc
@@ -39,3 +39,14 @@ For example :
 == Log directories in docker 
 
 For the services cards-reminder, supervisor, cards-external-diffusion the log directory in the docker is not anymore /usr/app/logs but /var/log/opfab. So if you map the log directory in your configuration , you need to change it. 
+
+
+== OpfabAPI
+
+The following method is deprecated and it is recommended you use the new method:
+
+|===
+|Deprecated method or attribute | New method
+
+|opfab.currentCard.getEntityUsedForUserResponse()
+|opfab.currentCard.getEntitiesUsableForUserResponse()
\ No newline at end of file
diff --git a/src/test/cypress/cypress/integration/CardDetail.spec.js b/src/test/cypress/cypress/integration/CardDetail.spec.js
index 50f76817bf..014c77d84e 100644
--- a/src/test/cypress/cypress/integration/CardDetail.spec.js
+++ b/src/test/cypress/cypress/integration/CardDetail.spec.js
@@ -48,7 +48,7 @@ describe('Card detail', function () {
             cy.get('#opfab-users-entities-getEntityName-unknownEntity').contains('unknownEntity');
             cy.get('#opfab-currentCard-isUserAllowedToRespond').contains('true');
             cy.get('#opfab-currentCard-isUserMemberOfAnEntityRequiredToRespond').contains('true');
-            cy.get('#opfab-currentCard-getEntityUsedForUserResponse').contains(/^ENTITY1_FR$/);
+            cy.get('#opfab-currentCard-getEntitiesUsableForUserResponse').contains(/^ENTITY1_FR$/);
             cy.get('#opfab-currentCard-getDisplayContext').contains(/^realtime$/);
             cy.get('#opfab-users-entities-getAllEntities').contains(
                 'entity[0]:id=ENTITY1_FR,name=Control Center FR North,description=Control Center FR North,entityAllowedToSendCard=true,parents=ENTITY_FR,labels=FR1 label'
diff --git a/src/test/resources/bundles/cypress/template/kitchenSink.handlebars b/src/test/resources/bundles/cypress/template/kitchenSink.handlebars
index 9ef2c612eb..4df7569e7d 100644
--- a/src/test/resources/bundles/cypress/template/kitchenSink.handlebars
+++ b/src/test/resources/bundles/cypress/template/kitchenSink.handlebars
@@ -32,7 +32,7 @@
 <div> onTemplateRenderingComplete : <span id="opfab-currentCard-onTemplateRenderingComplete"> </span>  </div>
 
 <H3> OPFAB CALLS</H3>
-<div><span id="showCardLink" style="cursor:pointer;color:blue;text-decoration:underline;" onclick="opfab.navigate.showCardInFeed('defaultProcess.process1')">LINK TO ANOTHER CARD</span></div>
+<div><span id="showCardLink" style="cursor:pointer;color:rgb(19, 85, 170);text-decoration:underline;" onclick="opfab.navigate.showCardInFeed('defaultProcess.process1')">LINK TO ANOTHER CARD</span></div>
 
 <H3> HANDLEBARS TEMPLATING </H3>
 
@@ -71,8 +71,8 @@ function loadData() {
   responses += opfab.currentCard.isUserMemberOfAnEntityRequiredToRespond();
   responses += '</span></div>';
 
-  responses += '<div> getEntityUsedForUserResponse() : <span id="opfab-currentCard-getEntityUsedForUserResponse">';
-  responses += opfab.currentCard.getEntityUsedForUserResponse();
+  responses += '<div> getEntitiesUsableForUserResponse() : <span id="opfab-currentCard-getEntitiesUsableForUserResponse">';
+  responses += opfab.currentCard.getEntitiesUsableForUserResponse();
   responses += '</span></div>';
 
   responses += '<div> getDisplayContext() : <span id="opfab-currentCard-getDisplayContext">';
diff --git a/src/test/resources/bundles/messageOrQuestionExample/template/confirmation.handlebars b/src/test/resources/bundles/messageOrQuestionExample/template/confirmation.handlebars
index 5ce3896f13..3a4a75435f 100644
--- a/src/test/resources/bundles/messageOrQuestionExample/template/confirmation.handlebars
+++ b/src/test/resources/bundles/messageOrQuestionExample/template/confirmation.handlebars
@@ -31,7 +31,6 @@
 <br/>
  <div id="entities-div"> </div>
 <br/>
- <div id="response-entity-div"> </div>
 
 
 <script>
@@ -43,7 +42,6 @@
             this.disableResponseIfNotInRealTimeContext();
             this.initOpfabAPI();
             this.loadEntitiesList();
-            this.loadEntityUsedForResponse();
         },
 
         disableResponseIfNotInRealTimeContext: function() {
@@ -118,17 +116,9 @@
                     text +=  opfab.utils.escapeHtml(opfab.users.entities.getEntityName(id));
                     }
             );
-            // if it is in card preview (usercard) , the template gateway does not contain the list 
+            // if it is in card preview (usercard), the template gateway does not contain the list 
             // so we show nothing
             if (entities.length>0) entitiesDiv.innerHTML = text;
-        },
-
-        loadEntityUsedForResponse: function() {
-            let responseEntityDiv = document.getElementById("response-entity-div");
-            let responseEntity = opfab.currentCard.getEntityUsedForUserResponse();
-            let userAllowedToRespond = opfab.currentCard.isUserAllowedToRespond();
-            if (userAllowedToRespond && responseEntity) 
-                responseEntityDiv.innerHTML = "Entity used by user to respond : " + opfab.users.entities.getEntityName(responseEntity);         
         }
     }
      
diff --git a/src/test/resources/cards/sendCard.sh b/src/test/resources/cards/sendCard.sh
index 4937ce2e64..e5cc4e6d5b 100755
--- a/src/test/resources/cards/sendCard.sh
+++ b/src/test/resources/cards/sendCard.sh
@@ -48,4 +48,6 @@ else
     export current_date_in_milliseconds_from_epoch_plus_48hours=$(($current_date_millis + 48*60*60*1000))
     echo "send card $1 (url: $url)"
     curl -X POST $url:2102/cards -H "Authorization: Bearer $token" -H "Content-type:application/json" --data "$(envsubst <$1)"
-fi
\ No newline at end of file
+fi
+
+echo 
\ No newline at end of file
diff --git a/ui/main/src/app/business/services/opfabAPI.service.ts b/ui/main/src/app/business/services/opfabAPI.service.ts
index 3ce186c104..395201f1e3 100644
--- a/ui/main/src/app/business/services/opfabAPI.service.ts
+++ b/ui/main/src/app/business/services/opfabAPI.service.ts
@@ -24,10 +24,7 @@ export class OpfabAPIService {
     public templateInterface: any;
     public userCardTemplateInterface: any;
 
-    constructor(
-        private businessDataService: BusinessDataService,
-        private translationService: TranslationService
-    ) {
+    constructor(private businessDataService: BusinessDataService, private translationService: TranslationService) {
         this.initCurrentCard();
         this.initCurrentUserCard();
     }
@@ -41,6 +38,7 @@ export class OpfabAPIService {
             isUserMemberOfAnEntityRequiredToRespond: false,
             entitiesAllowedToRespond: [],
             entityUsedForUserResponse: null,
+            entitiesUsableForUserResponse: [],
             displayContext: '',
             isResponseLocked: false,
             displayLoadingSpinner: function () {},
@@ -202,8 +200,14 @@ export class OpfabAPIService {
             return self.currentCard.entitiesAllowedToRespond;
         };
         opfab.currentCard.getEntityUsedForUserResponse = function () {
+            console.warn(new Date().toISOString(), 
+                ' WARNING : Use of opfab.currentCard.getEntityUsedForUserResponse is deprecated, you should use opfab.currentCard.getEntitiesUsableForUserResponse instead'
+            );
             return self.currentCard.entityUsedForUserResponse;
         };
+        opfab.currentCard.getEntitiesUsableForUserResponse = function () {
+            return self.currentCard.entitiesUsableForUserResponse;
+        };
 
         opfab.currentCard.hideLoadingSpinner = function () {
             self.currentCard.hideLoadingSpinner();
diff --git a/ui/main/src/app/modules/card/components/card-body/card-body.component.ts b/ui/main/src/app/modules/card/components/card-body/card-body.component.ts
index e0750f20f6..beb95a6c34 100644
--- a/ui/main/src/app/modules/card/components/card-body/card-body.component.ts
+++ b/ui/main/src/app/modules/card/components/card-body/card-body.component.ts
@@ -306,7 +306,8 @@ export class CardBodyComponent implements OnChanges, OnInit, OnDestroy {
         this.opfabAPIService.currentCard.isUserMemberOfAnEntityRequiredToRespond =
             this.userMemberOfAnEntityRequiredToRespondAndAllowedToSendCards;
         this.opfabAPIService.currentCard.entityUsedForUserResponse = this.userEntityIdToUseForResponse;
-    }
+        this.opfabAPIService.currentCard.entitiesUsableForUserResponse = this.userEntityIdsPossibleForResponse;
+        }
 
     private stopRegularlyCheckLttd() {
         this.regularlyLttdCheckActive = false;
diff --git a/ui/main/src/assets/js/templateGateway.js b/ui/main/src/assets/js/templateGateway.js
index 2ea3abaeab..afad64354e 100644
--- a/ui/main/src/assets/js/templateGateway.js
+++ b/ui/main/src/assets/js/templateGateway.js
@@ -14,7 +14,7 @@ const templateGateway = {
     getEntityName: function (entityId) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.getEntityName is deprecated , you shall use opfab.users.entities.getEntityName instead'
+            ' WARNING : Use of templateGateway.getEntityName is deprecated , you should use opfab.users.entities.getEntityName instead'
         );
         return opfab.users.entities.getEntityName(entityId);
     },
@@ -22,7 +22,7 @@ const templateGateway = {
     getEntity: function (entityId) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.getEntity is deprecated , you shall use opfab.users.entities.getEntity instead'
+            ' WARNING : Use of templateGateway.getEntity is deprecated , you should use opfab.users.entities.getEntity instead'
         );
         return opfab.users.entities.getEntity(entityId);
     },
@@ -30,7 +30,7 @@ const templateGateway = {
     getAllEntities: function () {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.getAllEntities is deprecated , you shall use opfab.users.entities.getAllEntities instead'
+            ' WARNING : Use of templateGateway.getAllEntities is deprecated , you should use opfab.users.entities.getAllEntities instead'
         );
         return opfab.users.entities.getAllEntities();
     },
@@ -38,7 +38,7 @@ const templateGateway = {
     redirectToBusinessMenu: function (menuId, menuItemId, urlExtension) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.redirectToBusinessMenu is deprecated , you shall use opfab.navigate.redirectToBusinessMenu instead'
+            ' WARNING : Use of templateGateway.redirectToBusinessMenu is deprecated , you should use opfab.navigate.redirectToBusinessMenu instead'
         );
         opfab.navigate.redirectToBusinessMenu(menuId, menuItemId, urlExtension);
     },
@@ -49,7 +49,7 @@ const templateGateway = {
     isUserAllowedToRespond: function () {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.isUserAllowedToRespond is deprecated , you shall use opfab.currentCard.isUserAllowedToRespond instead'
+            ' WARNING : Use of templateGateway.isUserAllowedToRespond is deprecated , you should use opfab.currentCard.isUserAllowedToRespond instead'
         );
         return opfab.currentCard.isUserAllowedToRespond();
     },
@@ -58,7 +58,7 @@ const templateGateway = {
     isUserMemberOfAnEntityRequiredToRespond: function () {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.isUserMemberOfAnEntityRequiredToRespond is deprecated , you shall use opfab.currentCard.isUserMemberOfAnEntityRequiredToRespond instead'
+            ' WARNING : Use of templateGateway.isUserMemberOfAnEntityRequiredToRespond is deprecated , you should use opfab.currentCard.isUserMemberOfAnEntityRequiredToRespond instead'
         );
         return opfab.currentCard.isUserMemberOfAnEntityRequiredToRespond();
     },
@@ -67,7 +67,7 @@ const templateGateway = {
     getEntitiesAllowedToRespond() {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.getEntitiesAllowedToRespond is deprecated , you shall use opfab.currentCard.getEntitiesAllowedToRespond instead'
+            ' WARNING : Use of templateGateway.getEntitiesAllowedToRespond is deprecated , you should use opfab.currentCard.getEntitiesAllowedToRespond instead'
         );
         return opfab.currentCard.getEntitiesAllowedToRespond();
     },
@@ -75,7 +75,7 @@ const templateGateway = {
     getEntityUsedForUserResponse() {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.getEntityUsedForUserResponse is deprecated , you shall use opfab.currentCard.getEntityUsedForUserResponse instead'
+            ' WARNING : Use of templateGateway.getEntityUsedForUserResponse is deprecated , you should use opfab.currentCard.getEntityUsedForUserResponse instead'
         );
         return opfab.currentCard.getEntityUsedForUserResponse();
     },
@@ -83,7 +83,7 @@ const templateGateway = {
     getDisplayContext() {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.getDisplayContext is deprecated , you shall use opfab.currentCard.getDisplayContext instead'
+            ' WARNING : Use of templateGateway.getDisplayContext is deprecated , you should use opfab.currentCard.getDisplayContext instead'
         );
         return opfab.currentCard.getDisplayContext();
     },
@@ -91,7 +91,7 @@ const templateGateway = {
     displayLoadingSpinner() {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.displayLoadingSpinner is deprecated , you shall use opfab.currentCard.displayLoadingSpinner instead'
+            ' WARNING : Use of templateGateway.displayLoadingSpinner is deprecated , you should use opfab.currentCard.displayLoadingSpinner instead'
         );
         opfab.currentCard.displayLoadingSpinner();
     },
@@ -99,7 +99,7 @@ const templateGateway = {
     hideLoadingSpinner() {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.hideLoadingSpinner is deprecated , you shall use opfab.currentCard.hideLoadingSpinner instead'
+            ' WARNING : Use of templateGateway.hideLoadingSpinner is deprecated , you should use opfab.currentCard.hideLoadingSpinner instead'
         );
         opfab.currentCard.hideLoadingSpinner();
     },
@@ -111,7 +111,7 @@ const templateGateway = {
     get childCards() {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.childCards is deprecated , you shall use opfab.currentCard.getChildCards() instead'
+            ' WARNING : Use of templateGateway.childCards is deprecated , you should use opfab.currentCard.getChildCards() instead'
         );
         return opfab.currentCard.getChildCards();
     },
@@ -119,7 +119,7 @@ const templateGateway = {
     get isLocked() {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.isLocked is deprecated , you shall use opfab.currentCard.isResponseLocked() instead'
+            ' WARNING : Use of templateGateway.isLocked is deprecated , you should use opfab.currentCard.isResponseLocked() instead'
         );
         return opfab.currentCard.isResponseLocked();
     },
@@ -127,7 +127,7 @@ const templateGateway = {
     set lockAnswer(value) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.lockAnswer is deprecated , you shall use opfab.currentCard.listenToResponseLock() instead'
+            ' WARNING : Use of templateGateway.lockAnswer is deprecated , you should use opfab.currentCard.listenToResponseLock() instead'
         );
         opfab.currentCard.listenToResponseLock(value);
     },
@@ -135,7 +135,7 @@ const templateGateway = {
     set unlockAnswer(value) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.unlockAnswer is deprecated , you shall use opfab.currentCard.listenToResponseUnlock() instead'
+            ' WARNING : Use of templateGateway.unlockAnswer is deprecated , you should use opfab.currentCard.listenToResponseUnlock() instead'
         );
         opfab.currentCard.listenToResponseUnlock(value);
     },
@@ -143,7 +143,7 @@ const templateGateway = {
     set setLttdExpired(value) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.setLttdExpired is deprecated , you shall use opfab.currentCard.listenToLttdExpired() instead'
+            ' WARNING : Use of templateGateway.setLttdExpired is deprecated , you should use opfab.currentCard.listenToLttdExpired() instead'
         );
         opfab.currentCard.listenToLttdExpired(value);
     },
@@ -151,7 +151,7 @@ const templateGateway = {
     set onStyleChange(value) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.onStyleChange is deprecated , you shall use opfab.currentCard.listenToStyleChange() instead'
+            ' WARNING : Use of templateGateway.onStyleChange is deprecated , you should use opfab.currentCard.listenToStyleChange() instead'
         );
         opfab.currentCard.listenToStyleChange(value);
     },
@@ -159,7 +159,7 @@ const templateGateway = {
     set setScreenSize(value) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.setScreenSize is deprecated , you shall use opfab.currentCard.listenToScreenSize() instead'
+            ' WARNING : Use of templateGateway.setScreenSize is deprecated , you should use opfab.currentCard.listenToScreenSize() instead'
         );
         opfab.currentCard.listenToScreenSize(value);
     },
@@ -167,7 +167,7 @@ const templateGateway = {
     set onTemplateRenderingComplete(value) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.onTemplateRenderingComplete is deprecated , you shall use opfab.currentCard.listenToTemplateRenderingComplete() instead'
+            ' WARNING : Use of templateGateway.onTemplateRenderingComplete is deprecated , you should use opfab.currentCard.listenToTemplateRenderingComplete() instead'
         );
         opfab.currentCard.listenToTemplateRenderingComplete(value);
     },
@@ -175,7 +175,7 @@ const templateGateway = {
     set getUserResponse(value) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.getUserResponse is deprecated , you shall use opfab.currentCard.registerFunctionToGetUserResponse() instead'
+            ' WARNING : Use of templateGateway.getUserResponse is deprecated , you should use opfab.currentCard.registerFunctionToGetUserResponse() instead'
         );
         opfab.currentCard.registerFunctionToGetUserResponse(value);
     },
@@ -183,7 +183,7 @@ const templateGateway = {
     set applyChildCards(value) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of templateGateway.applyChildCards is deprecated , you shall use opfab.currentCard.listenToChildCards() instead'
+            ' WARNING : Use of templateGateway.applyChildCards is deprecated , you should use opfab.currentCard.listenToChildCards() instead'
         );
         opfab.currentCard.listenToChildCards(value);
     }
diff --git a/ui/main/src/assets/js/usercardTemplateGateway.js b/ui/main/src/assets/js/usercardTemplateGateway.js
index afd9b19f36..76c80ecc21 100644
--- a/ui/main/src/assets/js/usercardTemplateGateway.js
+++ b/ui/main/src/assets/js/usercardTemplateGateway.js
@@ -17,7 +17,7 @@ const usercardTemplateGateway = {
     getEditionMode() {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.getEditionMode is deprecated , you shall use opfab.currentUserCard.getEditionMode instead'
+            ' WARNING : Use of usercardTemplateGateway.getEditionMode is deprecated , you should use opfab.currentUserCard.getEditionMode instead'
         );
         return opfab.currentUserCard.getEditionMode();
     },
@@ -25,7 +25,7 @@ const usercardTemplateGateway = {
     getUserEntityChildCardFromCurrentCard() {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.getUserEntityChildCardFromCurrentCard is deprecated , you shall use opfab.currentUserCard.getUserEntityChildCard instead'
+            ' WARNING : Use of usercardTemplateGateway.getUserEntityChildCardFromCurrentCard is deprecated , you should use opfab.currentUserCard.getUserEntityChildCard instead'
         );
         return opfab.currentUserCard.getUserEntityChildCard();
        
@@ -34,7 +34,7 @@ const usercardTemplateGateway = {
     getCurrentState() {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.getCurrentState is deprecated , you shall use opfab.currentUserCard.getState instead'
+            ' WARNING : Use of usercardTemplateGateway.getCurrentState is deprecated , you should use opfab.currentUserCard.getState instead'
         );
         return opfab.currentUserCard.getState();
         
@@ -43,7 +43,7 @@ const usercardTemplateGateway = {
     getCurrentProcess() {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.getCurrentProcess is deprecated , you shall use opfab.currentUserCard.getProcessId instead'
+            ' WARNING : Use of usercardTemplateGateway.getCurrentProcess is deprecated , you should use opfab.currentUserCard.getProcessId instead'
         );
         return opfab.currentUserCard.getProcessId();
     },
@@ -51,7 +51,7 @@ const usercardTemplateGateway = {
     getStartDate() {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.getStartDate is deprecated , you shall use opfab.currentUserCard.getStartDate instead'
+            ' WARNING : Use of usercardTemplateGateway.getStartDate is deprecated , you should use opfab.currentUserCard.getStartDate instead'
         );
         return opfab.currentUserCard.getStartDate();
     },
@@ -59,7 +59,7 @@ const usercardTemplateGateway = {
     getEndDate() {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.getEndDate is deprecated , you shall use opfab.currentUserCard.getEndDate instead'
+            ' WARNING : Use of usercardTemplateGateway.getEndDate is deprecated , you should use opfab.currentUserCard.getEndDate instead'
         );
         return opfab.currentUserCard.getEndDate();
     },
@@ -67,7 +67,7 @@ const usercardTemplateGateway = {
     getLttd() {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.getLttd is deprecated , you shall use opfab.currentUserCard.getLttd instead'
+            ' WARNING : Use of usercardTemplateGateway.getLttd is deprecated , you should use opfab.currentUserCard.getLttd instead'
         );
         return opfab.currentUserCard.getLttd();
 
@@ -76,7 +76,7 @@ const usercardTemplateGateway = {
     getExpirationDate() {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.getExpirationDate is deprecated , you shall use opfab.currentUserCard.getExpirationDate instead'
+            ' WARNING : Use of usercardTemplateGateway.getExpirationDate is deprecated , you should use opfab.currentUserCard.getExpirationDate instead'
         );
         return opfab.currentUserCard.getExpirationDate();
     },
@@ -84,7 +84,7 @@ const usercardTemplateGateway = {
     getSelectedEntityRecipients() {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.getSelectedEntityRecipients is deprecated , you shall use opfab.currentUserCard.getSelectedEntityRecipients instead'
+            ' WARNING : Use of usercardTemplateGateway.getSelectedEntityRecipients is deprecated , you should use opfab.currentUserCard.getSelectedEntityRecipients instead'
         );
         return opfab.currentUserCard.getSelectedEntityRecipients();
     },
@@ -92,7 +92,7 @@ const usercardTemplateGateway = {
     getSelectedEntityForInformationRecipients() {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.getSelectedEntityForInformationRecipients is deprecated , you shall use opfab.currentUserCard.getSelectedEntityForInformationRecipients instead'
+            ' WARNING : Use of usercardTemplateGateway.getSelectedEntityForInformationRecipients is deprecated , you should use opfab.currentUserCard.getSelectedEntityForInformationRecipients instead'
         );
         return opfab.currentUserCard.getSelectedEntityForInformationRecipients();
     },
@@ -100,7 +100,7 @@ const usercardTemplateGateway = {
     setDropdownEntityRecipientList: function(recipients) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.setDropdownEntityRecipientList is deprecated , you shall use opfab.currentUserCard.setDropdownEntityRecipientList instead'
+            ' WARNING : Use of usercardTemplateGateway.setDropdownEntityRecipientList is deprecated , you should use opfab.currentUserCard.setDropdownEntityRecipientList instead'
         );
         opfab.currentUserCard.setDropdownEntityRecipientList(recipients);
     },
@@ -108,7 +108,7 @@ const usercardTemplateGateway = {
     setDropdownEntityRecipientForInformationList: function(recipients) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.setDropdownEntityRecipientForInformationList is deprecated , you shall use opfab.currentUserCard.setDropdownEntityRecipientForInformationList instead'
+            ' WARNING : Use of usercardTemplateGateway.setDropdownEntityRecipientForInformationList is deprecated , you should use opfab.currentUserCard.setDropdownEntityRecipientForInformationList instead'
         );
         opfab.currentUserCard.setDropdownEntityRecipientForInformationList(recipients);
     },
@@ -116,7 +116,7 @@ const usercardTemplateGateway = {
     setInitialStartDate: function (startDate) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.setInitialStartDate is deprecated , you shall use opfab.currentUserCard.setInitialStartDate instead'
+            ' WARNING : Use of usercardTemplateGateway.setInitialStartDate is deprecated , you should use opfab.currentUserCard.setInitialStartDate instead'
         );
         opfab.currentUserCard.setInitialStartDate(startDate);
     },
@@ -124,7 +124,7 @@ const usercardTemplateGateway = {
     setInitialEndDate: function (endDate) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.setInitialEndDate is deprecated , you shall use opfab.currentUserCard.setInitialEndDate instead'
+            ' WARNING : Use of usercardTemplateGateway.setInitialEndDate is deprecated , you should use opfab.currentUserCard.setInitialEndDate instead'
         );
         opfab.currentUserCard.setInitialEndDate(endDate);
     },
@@ -132,7 +132,7 @@ const usercardTemplateGateway = {
     setInitialLttd: function (lttd) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.setInitialLttd is deprecated , you shall use opfab.currentUserCard.setInitialLttd instead'
+            ' WARNING : Use of usercardTemplateGateway.setInitialLttd is deprecated , you should use opfab.currentUserCard.setInitialLttd instead'
         );
         opfab.currentUserCard.setInitialLttd(lttd);
     },
@@ -140,7 +140,7 @@ const usercardTemplateGateway = {
     setInitialExpirationDate: function (expirationDate) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.setInitialExpirationDate is deprecated , you shall use opfab.currentUserCard.setInitialExpirationDate instead'
+            ' WARNING : Use of usercardTemplateGateway.setInitialExpirationDate is deprecated , you should use opfab.currentUserCard.setInitialExpirationDate instead'
         );
         opfab.currentUserCard.setInitialExpirationDate(expirationDate);
     },
@@ -148,7 +148,7 @@ const usercardTemplateGateway = {
     setInitialSelectedRecipients(recipients) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of userCardTemplateGateway.setInitialSelectedRecipients is deprecated , you shall use opfab.currentUserCard.setInitialSelectedRecipients instead'
+            ' WARNING : Use of userCardTemplateGateway.setInitialSelectedRecipients is deprecated , you should use opfab.currentUserCard.setInitialSelectedRecipients instead'
         );
         opfab.currentUserCard.setInitialSelectedRecipients(recipients);
     },
@@ -157,7 +157,7 @@ const usercardTemplateGateway = {
     setInitialSelectedRecipientsForInformation(recipients) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of userCardTemplateGateway.setInitialSelectedRecipientsForInformation is deprecated , you shall use opfab.currentUserCard.setInitialSelectedRecipientsForInformation instead'
+            ' WARNING : Use of userCardTemplateGateway.setInitialSelectedRecipientsForInformation is deprecated , you should use opfab.currentUserCard.setInitialSelectedRecipientsForInformation instead'
         );
         opfab.currentUserCard.setInitialSelectedRecipientsForInformation(recipients);
     },
@@ -165,7 +165,7 @@ const usercardTemplateGateway = {
     setInitialSeverity: function (initialSeverity) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.setInitialSeverity is deprecated , you shall use opfab.currentUserCard.setInitialSeverity instead'
+            ' WARNING : Use of usercardTemplateGateway.setInitialSeverity is deprecated , you should use opfab.currentUserCard.setInitialSeverity instead'
         );
         opfab.currentUserCard.setInitialSeverity(initialSeverity);
     },
@@ -173,7 +173,7 @@ const usercardTemplateGateway = {
     set getSpecificCardInformation(value) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of usercardTemplateGateway.getSpecificCardInformation is deprecated , you shall use opfab.currentUserCard.registerFunctionToGetSpecificCardInformation() instead'
+            ' WARNING : Use of usercardTemplateGateway.getSpecificCardInformation is deprecated , you should use opfab.currentUserCard.registerFunctionToGetSpecificCardInformation() instead'
         );
         opfab.currentUserCard.registerFunctionToGetSpecificCardInformation(value);
     },
@@ -182,7 +182,7 @@ const usercardTemplateGateway = {
     set setEntityUsedForSendingCard(value) {
         console.warn(
             new Date().toISOString(),
-            ' WARNING : Use of userCardTemplateGateway.setEntityUsedForSendingCard is deprecated , you shall use opfab.currentUserCard.listenToEntityUsedForSendingCard instead'
+            ' WARNING : Use of userCardTemplateGateway.setEntityUsedForSendingCard is deprecated , you should use opfab.currentUserCard.listenToEntityUsedForSendingCard instead'
         );
         opfab.currentUserCard.listenToEntityUsedForSendingCard(value);
     },
diff --git a/ui/main/src/tests/mocks/opfabApi.mock.ts b/ui/main/src/tests/mocks/opfabApi.mock.ts
index a60ad9ae0c..0701ab5ea0 100644
--- a/ui/main/src/tests/mocks/opfabApi.mock.ts
+++ b/ui/main/src/tests/mocks/opfabApi.mock.ts
@@ -33,6 +33,7 @@ export function initOpfabApiMock() {
         isUserMemberOfAnEntityRequiredToRespond: function () {},
         getEntitiesAllowedToRespond: function () {},
         getEntityUsedForUserResponse: function () {},
+        getEntitiesUsableForUserResponse: function () {},
         getDisplayContext: function () {},
         isResponseLocked: function () {},
         getChildCards: function () {},