diff --git a/src/main/java/com/frentix/olat/course/nodes/vitero/_i18n/LocalStrings_de.properties b/src/main/java/com/frentix/olat/course/nodes/vitero/_i18n/LocalStrings_de.properties
index d024568118604103174405328fbb69d67aa4695f..070e715e279c298449ac648d3c618b8113b11371 100644
--- a/src/main/java/com/frentix/olat/course/nodes/vitero/_i18n/LocalStrings_de.properties
+++ b/src/main/java/com/frentix/olat/course/nodes/vitero/_i18n/LocalStrings_de.properties
@@ -2,4 +2,5 @@ error.vmsNotAvailable=$com.frentix.olat.vitero.ui\:verror.vmsNotAvailable
 table.empty=$com.frentix.olat.vitero.ui\:table.empty
 pane.tab.accessibility=Zugang
 pane.tab.vcconfig=Konfiguration
-condition.accessibility.title=Zugang
\ No newline at end of file
+condition.accessibility.title=Zugang
+title_vc=Vitero
\ No newline at end of file
diff --git a/src/main/java/com/frentix/olat/vitero/ui/ViteroBookingsAdminController.java b/src/main/java/com/frentix/olat/vitero/ui/ViteroBookingsAdminController.java
index 2f2fd610842c3851abb99e1d1918c512cda4c4d7..9da39b50708bb5e16263c353924539aad3a4c426 100644
--- a/src/main/java/com/frentix/olat/vitero/ui/ViteroBookingsAdminController.java
+++ b/src/main/java/com/frentix/olat/vitero/ui/ViteroBookingsAdminController.java
@@ -151,7 +151,12 @@ public class ViteroBookingsAdminController extends BasicController {
 			} else {
 				OLATResourceable ores = OresHelper.createOLATResourceableInstance(prop.getResourceTypeName(), prop.getResourceTypeId());
 				RepositoryEntry re = RepositoryManager.getInstance().lookupRepositoryEntry(ores, false);
-				url = "[RepositoryEntry:" + re.getKey() + "]";
+				if(re != null) {
+					url = "[RepositoryEntry:" + re.getKey() + "]";
+				} else {
+					showWarning("resource.dont.exist");
+					return;
+				}
 			}
 			BusinessControl bc = BusinessControlFactory.getInstance().createFromString(url);
 			WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(bc, getWindowControl());
diff --git a/src/main/java/com/frentix/olat/vitero/ui/ViteroBookingsEditController.java b/src/main/java/com/frentix/olat/vitero/ui/ViteroBookingsEditController.java
index 872120064395a1ec72547a42c67e1c8351f3199d..f073dbe436096af889a82d600bac3b857cca312d 100644
--- a/src/main/java/com/frentix/olat/vitero/ui/ViteroBookingsEditController.java
+++ b/src/main/java/com/frentix/olat/vitero/ui/ViteroBookingsEditController.java
@@ -102,11 +102,12 @@ public class ViteroBookingsEditController extends FormBasicController {
 	protected void reloadModel() {
 		bookingDisplays.clear(); 
 		List<ViteroBooking> bookings = viteroManager.getBookings(group, ores);
+		int i=0;
 		for(ViteroBooking booking:bookings) {
 			BookingDisplay display = new BookingDisplay(booking);
-			display.setDeleteButton(uifactory.addFormLink("delete", flc, Link.BUTTON));
-			display.setEditButton(uifactory.addFormLink("edit", flc, Link.BUTTON));
-			display.setUsersButton(uifactory.addFormLink("users", flc, Link.BUTTON));
+			display.setDeleteButton(uifactory.addFormLink("delete_" + i++, "delete", "delete", flc, Link.BUTTON));
+			display.setEditButton(uifactory.addFormLink("edit_" + i++, "edit", "edit", flc, Link.BUTTON));
+			display.setUsersButton(uifactory.addFormLink("users_" + i++, "users", "users", flc, Link.BUTTON));
 			bookingDisplays.add(display);
 		}
 		flc.contextPut("bookingDisplays", bookingDisplays);