Fixed #60.
OPEN - issue GRD-89: Email Notification sender sometimes uses wrong tenant 
https://quikdo.atlassian.net/browse/GRD-89