Revert no-HTML email with token ( d395aafa918e32730d2a0ec36880de3be669f50a )
Remove "Coffee Mug" reference and fix password reset form