diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AbstractContactableEntityEditStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AbstractContactableEntityEditStep.java
index 3c48c4667..0d5fce649 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AbstractContactableEntityEditStep.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AbstractContactableEntityEditStep.java
@@ -34,6 +34,7 @@ import org.librecms.ui.contentsections.ContentSectionNotFoundException;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
 
 import javax.inject.Inject;
@@ -337,7 +338,8 @@ public abstract class AbstractContactableEntityEditStep
         model.setEntryKey(entryKey.getEntryKey());
         model.setLabel(
             globalizationHelper.getValueFromLocalizedString(
-                entryKey.getLabel())
+                entryKey.getLabel(), entryKey::getEntryKey
+            )
         );
 
         return model;
@@ -352,7 +354,7 @@ public abstract class AbstractContactableEntityEditStep
         model.setEntryKeyId(entry.getKey().getKeyId());
         model.setEntryKeyLabel(
             globalizationHelper.getValueFromLocalizedString(
-                entry.getKey().getLabel()
+                entry.getKey().getLabel(), entry.getKey()::getEntryKey
             )
         );
         model.setOrder(entry.getOrder());
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ContactableEntityEditStepModel.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ContactableEntityEditStepModel.java
index ee3dbf71a..4c41eba20 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ContactableEntityEditStepModel.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ContactableEntityEditStepModel.java
@@ -33,8 +33,6 @@ import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
 
 /**
  *
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/edit-contactable.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/edit-contactable.xhtml
index efd8d198e..458329871 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/edit-contactable.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/edit-contactable.xhtml
@@ -94,16 +94,17 @@
                                 <td>
                                     <button class="btn btn-primary"
                                             data-toggle="modal"
-                                            data-target="#edit-contactntry-dialog-#{entry.contactEntryId}"
+                                            data-target="#edit-contactentry-dialog-#{entry.contactEntryId}"
                                             type="button">
                                         <bootstrap:svgIcon icon="pen" />
                                         <span class="sr-only">#{CmsAssetsStepsDefaultMessagesBundle['contactable.contactentries.edit']}</span>
                                     </button>
                                     <div aria-hidden="true"
                                          aria-labelledby="edit-contactntry-dialog-#{entry.contactEntryId}-title"
+                                         id="edit-contactentry-dialog-#{entry.contactEntryId}"
                                          class="modal fade"
                                          tabindex="-1">
-                                        <div class="modal-content">
+                                        <div class="modal-dialog">
                                             <form action="#{actionBaseUrl}/contactentries/#{entry.order}"
                                                   class="modal-content"
                                                   method="post">
@@ -162,6 +163,7 @@
                                     <div aria-hidden="true"
                                          aria-labelledby="remove-contactentry-dialog-#{entry.contactEntryId}-title"
                                          class="modal fade"
+                                         id="remove-contactentry-dialog-#{entry.contactEntryId}"
                                          tabindex="-1">
                                         <div class="modal-dialog">
                                             <form action="#{actionBaseUrl}/contactentries/#{entry.order}/@remove"
@@ -182,7 +184,7 @@
                                                 </div>
                                                 <div class="modal-body">
                                                     <p>
-                                                        #{CmsDefaultStepsMessageBundle.getMessage('contactable.contactentries.remove.message', [entry.entryKeyLabel, entry.value])}
+                                                        #{CmsAssetsStepsDefaultMessagesBundle.getMessage('contactable.contactentries.remove.message', [entry.entryKeyLabel, entry.value])}
                                                     </p>
                                                 </div>
                                                 <div class="modal-footer">
@@ -216,7 +218,7 @@
             baseUrl="#{CmsContactableEditStepModel.baseUrl}"
             contentSection="#{ContentSectionModel.sectionName}"
             formParamName="postalAddressIdentifier"
-            
+
             />
 
         <c:choose>