diff --git a/src/main/java/org/olat/core/util/mail/manager/MailManager.java b/src/main/java/org/olat/core/util/mail/manager/MailManager.java
index 9e195653e211923359a343c64254370ac3c523d4..5726dbac304318184dd9adef94452e49a4260923 100644
--- a/src/main/java/org/olat/core/util/mail/manager/MailManager.java
+++ b/src/main/java/org/olat/core/util/mail/manager/MailManager.java
@@ -414,6 +414,7 @@ public class MailManager extends BasicManager {
 		StringBuilder sb = new StringBuilder();
 		String fetchOption = (fetchRecipients != null && fetchRecipients.booleanValue()) ? "fetch" : "";
 		sb.append("select mail from ").append(DBMailImpl.class.getName()).append(" mail")
+		  .append(" inner join fetch ").append(" mail.from fromRecipient")
 			.append(" inner join ").append(fetchOption).append(" mail.recipients recipient")
 			.append(" inner join ").append(fetchOption).append(" recipient.recipient recipientIdentity")
 			.append(" where recipientIdentity.key=:recipientKey and recipient.deleted=false");
diff --git a/src/main/java/org/olat/course/assessment/EfficiencyStatementManager.java b/src/main/java/org/olat/course/assessment/EfficiencyStatementManager.java
index 218195961c48855366c3e742e0d544fd87800b9c..e93ce494f35b9eb84db9642331e3b056def91c4c 100644
--- a/src/main/java/org/olat/course/assessment/EfficiencyStatementManager.java
+++ b/src/main/java/org/olat/course/assessment/EfficiencyStatementManager.java
@@ -444,6 +444,7 @@ public class EfficiencyStatementManager extends BasicManager implements UserData
 		try {
 			StringBuilder sb = new StringBuilder();
 			sb.append("select statement from ").append(UserEfficiencyStatementLight.class.getName()).append(" as statement ")
+				.append(" left join fetch statement.resource resource")
 			  .append(" where statement.identity.key=:identityKey");
 
 			DBQuery query = dbInstance.createQuery(sb.toString());