Index: lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java
===================================================================
diff -u -r328b2d5068eb7b9c271f43e55b3f19a05733312b -r8e26433cb74330271bfaf026ec27f5df26b1dbef
--- lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java	(.../EmailUserController.java)	(revision 328b2d5068eb7b9c271f43e55b3f19a05733312b)
+++ lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java	(.../EmailUserController.java)	(revision 8e26433cb74330271bfaf026ec27f5df26b1dbef)
@@ -114,8 +114,8 @@
 	}
 
 	boolean IS_HTML_FORMAT = false;
-	eventNotificationService.sendMessage(currentUser.getUserID(), userId.intValue(),
-		IEventNotificationService.DELIVERY_METHOD_MAIL, subject, body, IS_HTML_FORMAT);
+	eventNotificationService.sendMessage(null, userId.intValue(), IEventNotificationService.DELIVERY_METHOD_MAIL,
+		subject, body, IS_HTML_FORMAT);
 
 	String ccEmail = emailForm.getCcEmail();
 	if (StringUtils.isNotBlank(ccEmail) && ValidationUtil.isEmailValid(ccEmail, false)) {
Index: lams_common/src/java/org/lamsfoundation/lams/events/DeliveryMethodMail.java
===================================================================
diff -u -r35c310fa1c049061df6f0c0f43523015ae75b4a0 -r8e26433cb74330271bfaf026ec27f5df26b1dbef
--- lams_common/src/java/org/lamsfoundation/lams/events/DeliveryMethodMail.java	(.../DeliveryMethodMail.java)	(revision 35c310fa1c049061df6f0c0f43523015ae75b4a0)
+++ lams_common/src/java/org/lamsfoundation/lams/events/DeliveryMethodMail.java	(.../DeliveryMethodMail.java)	(revision 8e26433cb74330271bfaf026ec27f5df26b1dbef)
@@ -59,20 +59,10 @@
 		return "Target user's e-mail address is invalid.";
 	    }
 
-	    if (fromUserId == null) {
-		Emailer.sendFromSupportEmail(subject, toEmail, message, isHtmlFormat, attachmentFilename);
-	    } else {
-		User fromUser = (User) DeliveryMethodMail.userManagementService.findById(User.class, fromUserId);
-		if (fromUser == null) {
-		    return "Source user with ID " + fromUserId + " was not found.";
-		}
-		String fromEmail = fromUser.getEmail();
-		if (!DeliveryMethodMail.emailValidator.isValid(fromEmail)) {
-		    return "Source user's e-mail address is invalid.";
-		}
+	    // keep fromUserId parameter for consistency with other delivery method signatures
+	    // but ignore it as all emails are sent using the system account
 
-		Emailer.send(subject, toEmail, "", fromEmail, "", message, isHtmlFormat, attachmentFilename);
-	    }
+	    Emailer.sendFromSupportEmail(subject, toEmail, message, isHtmlFormat, attachmentFilename);
 	    return null;
 	} catch (Exception e) {
 	    String error = e.toString();