diff --git a/src/main/java/org/olat/group/ui/main/AccessActionColumnDescriptor.java b/src/main/java/org/olat/group/ui/main/AccessActionColumnDescriptor.java
index 76f193e448382a40a17843bf6adbfbe310abe7f3..37c20135012dac37512b08adee819c2ac101e7c8 100644
--- a/src/main/java/org/olat/group/ui/main/AccessActionColumnDescriptor.java
+++ b/src/main/java/org/olat/group/ui/main/AccessActionColumnDescriptor.java
@@ -19,13 +19,14 @@
  */
 package org.olat.group.ui.main;
 
-import static org.olat.group.ui.main.AbstractBusinessGroupListController.*;
+import static org.olat.group.ui.main.AbstractBusinessGroupListController.TABLE_ACTION_ACCESS;
+import static org.olat.group.ui.main.AbstractBusinessGroupListController.TABLE_ACTION_LEAVE;
 
 import org.olat.core.gui.components.table.DefaultColumnDescriptor;
 import org.olat.core.gui.render.Renderer;
 import org.olat.core.gui.render.StringOutput;
 import org.olat.core.gui.translator.Translator;
-import org.olat.group.model.BGMembership;
+import org.olat.group.BusinessGroupMembership;
 
 /**
  * 
@@ -50,7 +51,7 @@ public class AccessActionColumnDescriptor extends DefaultColumnDescriptor {
 		int sortedRow = table.getSortedRow(row);
 		
 		Object memberObj = table.getTableDataModel().getValueAt(sortedRow, BusinessGroupTableModelWithType.Cols.role.ordinal());
-		if(memberObj instanceof BGMembership) {
+		if(memberObj instanceof BusinessGroupMembership) {
 			//owner, participant, or in waiting list can leave
 			return TABLE_ACTION_LEAVE;
 		}
@@ -70,13 +71,14 @@ public class AccessActionColumnDescriptor extends DefaultColumnDescriptor {
 	public void renderValue(StringOutput sb, int row, Renderer renderer) {
 		int sortedRow = table.getSortedRow(row);
 		Object memberObj = table.getTableDataModel().getValueAt(sortedRow, BusinessGroupTableModelWithType.Cols.role.ordinal());
-		if(memberObj instanceof BGMembership) {
-			switch((BGMembership)memberObj) {
-				case owner:
-				case participant:
-					sb.append(translator.translate("table.header.leave")); break;
-				case waiting:
-					sb.append(translator.translate("table.header.leave.waiting")); break;
+		if(memberObj instanceof BusinessGroupMembership) {
+			BusinessGroupMembership membership = (BusinessGroupMembership)memberObj;
+			if(membership.isOwner()) {
+				//nothing???
+			} else if (membership.isParticipant()) {
+				sb.append(translator.translate("table.header.leave"));
+			} else if (membership.isWaiting()) {
+				sb.append(translator.translate("table.header.leave.waiting"));
 			}
 		} else {
 			Object wrapper = table.getTableDataModel().getValueAt(sortedRow, BusinessGroupTableModelWithType.Cols.wrapper.ordinal());
diff --git a/src/main/java/org/olat/group/ui/main/BGRoleCellRenderer.java b/src/main/java/org/olat/group/ui/main/BGRoleCellRenderer.java
index 5bceefc007076b779459351082be88a3255a503c..d42b377a0d1d68c6765e4d45b329df659de81789 100644
--- a/src/main/java/org/olat/group/ui/main/BGRoleCellRenderer.java
+++ b/src/main/java/org/olat/group/ui/main/BGRoleCellRenderer.java
@@ -27,7 +27,6 @@ import org.olat.core.gui.render.StringOutput;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.util.Util;
 import org.olat.group.BusinessGroupMembership;
-import org.olat.group.model.BGMembership;
 
 /**
  * 
@@ -43,23 +42,7 @@ public class BGRoleCellRenderer implements CustomCellRenderer {
 
 	@Override
 	public void render(StringOutput sb, Renderer renderer, Object val, Locale locale, int alignment, String action) {
-		if(val instanceof BGMembership) {
-			BGMembership membership = (BGMembership)val;
-			switch(membership) {
-				case owner: {
-					sb.append(translator.translate("owned.groups"));
-					break;
-				}
-				case participant: {
-					sb.append(translator.translate("search.attendee"));
-					break;
-				}
-				case waiting: {
-					sb.append(translator.translate("search.waiting"));
-					break;
-				}
-			}
-		} else if (val instanceof BusinessGroupMembership) {
+		if (val instanceof BusinessGroupMembership) {
 			BusinessGroupMembership membership = (BusinessGroupMembership)val;
 			
 			boolean and = false;