BUGFIX: Use email sender