diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonEditDetails.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonEditDetails.java
index ab7bfe0..42b9027 100644
--- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonEditDetails.java
+++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonEditDetails.java
@@ -40,6 +40,8 @@ public class PersonEditDetails extends HorizontalLayout {
 
 	public PersonEditDetails(List<GroupDef> groups, PersonDao dao, boolean showCloseButton) {
 
+		setCaption("Personendetails");
+
 		textPrename = new TextField("Vorname");
 		textSureName = new TextField("Nachname");
 		birthday = new DateField("Geburtstag");
diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java
index 5373093..c74cf41 100644
--- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java
+++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java
@@ -112,9 +112,7 @@ public class PersonGrid extends VerticalLayout {
 	public void setSelectionMode(SelectionMode selectionMode) {
 		grid.setSelectionMode(selectionMode);
 		currentSelectionMode = selectionMode;
-		if (selectionMode != SelectionMode.MULTI) {
-			checkIncluded.setVisible(false);
-		} else {
+		if (selectionMode == SelectionMode.MULTI) {
 			checkIncluded.setVisible(true);
 		}
 	}
@@ -122,6 +120,8 @@ public class PersonGrid extends VerticalLayout {
 	private Layout setupFilterComponents() {
 		checkIncluded.setId("person.filter.checked");
 		checkIncluded.addValueChangeListener(ev -> onSelectedOnly(ev));
+		checkIncluded.setVisible(false);
+
 		comboGroups.setId("person.filter.groups");
 		comboGroups.setEmptySelectionAllowed(true);
 		comboGroups.setEmptySelectionCaption("Alle");