Email fix

cc @iserko