KFSPTS-3645 fix delivery email and phone to be required