diff --git a/src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java b/src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java
index fbe21c94c353c325930d2dd80e710071cf578870..21e51e0e81ecd75c3a0cf469b553ef523e20cd26 100644
--- a/src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java
+++ b/src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java
@@ -180,7 +180,7 @@ public class UserDeletionManager {
 		StringBuilder sb = new StringBuilder(512);
 		sb.append("select ident from ").append(IdentityImpl.class.getName()).append(" as ident")
 		  .append(" inner join fetch ident.user as user")
-		  .append(" where ident.status=").append(Identity.STATUS_ACTIV).append(" and (ident.lastLogin = null or ident.lastLogin < :lastLogin)")
+		  .append(" where ident.status=").append(Identity.STATUS_ACTIV).append(" and ((ident.lastLogin = null and ident.creationDate < :lastLogin) or ident.lastLogin < :lastLogin)")
 		  .append(" and exists (select orgtomember.key from bgroupmember as orgtomember ")
 		  .append("  inner join organisation as org on (org.group.key=orgtomember.group.key)")
 		  .append("  where orgtomember.identity.key=ident.key and org.key in (:organisationKeys) and orgtomember.role='").append(OrganisationRoles.user).append("')");
diff --git a/src/main/java/org/olat/modules/ceditor/ui/TableEditorController.java b/src/main/java/org/olat/modules/ceditor/ui/TableEditorController.java
index 186034812cb488e34b0c73b4d6ce99061761f3fa..85971e7fe5cc41c132cbeace555792d3f312c7c2 100644
--- a/src/main/java/org/olat/modules/ceditor/ui/TableEditorController.java
+++ b/src/main/java/org/olat/modules/ceditor/ui/TableEditorController.java
@@ -293,8 +293,8 @@ public class TableEditorController extends FormBasicController implements PageEl
 				if(!dirty) {
 					col.getText().getComponent().setDirty(false);
 				}
-				boolean header = (settings.isRowHeaders() && i == 0)
-						|| (settings.isColumnHeaders() && col.getColumn() == 0);
+				boolean header = (settings.isColumnHeaders() && i == 0)
+						|| (settings.isRowHeaders() && col.getColumn() == 0);
 				col.setHeader(header);
 			}
 		}
diff --git a/src/main/java/org/olat/modules/ceditor/ui/TableRunController.java b/src/main/java/org/olat/modules/ceditor/ui/TableRunController.java
index cc1f5882cf51e147d8602c3b9e41f1cb2c200b48..e23c1453f4de9f1d2e8fb495813b969800f04fc2 100644
--- a/src/main/java/org/olat/modules/ceditor/ui/TableRunController.java
+++ b/src/main/java/org/olat/modules/ceditor/ui/TableRunController.java
@@ -84,6 +84,7 @@ public class TableRunController extends BasicController implements PageRunElemen
 		int i = 0;
 		if(settings.isColumnHeaders()) {
 			headerRows.add(loadColumns(i, content, settings));
+			i++;
 		}
 
 		for( ; i<numOfRows; i++) {
diff --git a/src/main/java/org/olat/modules/portfolio/ui/BinderListController.java b/src/main/java/org/olat/modules/portfolio/ui/BinderListController.java
index 804b33d04511d0fec0e65759c0bf9fc36a92da4b..d61a68646071d118b46d42519bccb37712f21adb 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/BinderListController.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/BinderListController.java
@@ -157,8 +157,12 @@ public class BinderListController extends FormBasicController
 	}
 	
 	public BinderRow getFirstBinder() {
-		if(model.getRowCount() > 0) {
-			return model.getObject(0);
+		int numOfRows = model.getRowCount();
+		for(int i=0; i<numOfRows; i++) {
+			BinderRow row = model.getObject(i);
+			if(row.getKey() != null) {
+				return row;
+			}
 		}
 		return null;
 	}
diff --git a/src/main/java/org/olat/modules/portfolio/ui/PortfolioHomeController.java b/src/main/java/org/olat/modules/portfolio/ui/PortfolioHomeController.java
index 0e170273997153a988e39b1b2752d169e87fc2a4..b30970ec4eb8cbca63ed07ca3e2bda0ba5118f06 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/PortfolioHomeController.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/PortfolioHomeController.java
@@ -160,9 +160,11 @@ public class PortfolioHomeController extends BasicController implements Activate
 			BinderListController bindersCtrl = doOpenMyBinders(ureq);
 			if(!portfolioModule.isLearnerCanCreateBinders() && bindersCtrl.getNumOfBinders() == 1) {
 				BinderRow row = bindersCtrl.getFirstBinder();
-				OLATResourceable resource = OresHelper.createOLATResourceableInstance(Binder.class, row.getKey());
-				List<ContextEntry> entries = BusinessControlFactory.getInstance().createCEListFromString(resource);
-				bindersCtrl.activate(ureq, entries, null);
+				if(row != null && row.getKey() != null) {
+					OLATResourceable resource = OresHelper.createOLATResourceableInstance(Binder.class, row.getKey());
+					List<ContextEntry> entries = BusinessControlFactory.getInstance().createCEListFromString(resource);
+					bindersCtrl.activate(ureq, entries, null);
+				}
 			}
 		} else if(myEntriesLink == source) {
 			doOpenMyPages(ureq);
@@ -175,7 +177,7 @@ public class PortfolioHomeController extends BasicController implements Activate
 		} else if(createNewEntryLink == source) {
 			doNewEntry(ureq);
 		} else if(showHelpLink == source) {
-
+			// do nothing
 		} else if(goToTrashLink == source) {
 			doDeletedPages(ureq);
 		} else if(stackPanel == source) {