diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
index 730aae06099..6529d1b1cd0 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
@@ -162,12 +162,19 @@ private Label  createCountLabel(String id, ObjectListPanel panel){
 	protected void onClick(AjaxRequestTarget target, T focus) {
 		parentPage.hideMainPopup(target);
 	}
+	
+	private void refreshCounts(AjaxRequestTarget target) {
+		addOrReplace(createCountContainer());
+		target.add(get(ID_COUNT_CONTAINER));
+	}
 
 	private PopupObjectListPanel<T> createObjectListPanel(String id, final String countId, final QName type) {
 		PopupObjectListPanel<T> listPanel = new PopupObjectListPanel<T>(id, qnameToCompileTimeClass(type), true, parentPage) {
 			@Override
 			protected void onUpdateCheckbox(AjaxRequestTarget target) {
-				target.add(getParent().getParent().addOrReplace(createCountContainer()));
+				refreshCounts(target);
+//				TypedAssignablePanel.this.get(ID_COUNT_CONTAINER)
+//				target.add(getParent().getParent().addOrReplace(createCountContainer()));
 			}
 		
 		};
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
index c0080fffd25..eb2a1c9d9c7 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
@@ -16,6 +16,7 @@
 
 package com.evolveum.midpoint.web.component.data.column;
 
+import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.data.BaseSortableDataProvider;
@@ -51,13 +52,13 @@ public CheckBoxHeaderColumn() {
     private boolean visible = true;
 
     @Override
-    public Component getHeader(String componentId) {
+    public Component getHeader(final String componentId) {
         final IModel<Boolean> model = new Model<Boolean>(false);
         CheckBoxPanel panel = new CheckBoxPanel(componentId, model, getEnabled()) {
 
             @Override
             public void onUpdate(AjaxRequestTarget target) {
-                DataTable table = findParent(DataTable.class);
+            	DataTable table = findParent(DataTable.class);
                 boolean selected = model.getObject() != null ? model.getObject() : false;
 
                 onUpdateHeader(target, selected, table);