Moved tip email deliver to after tip save