diff --git a/samples/DynamicsGPDiagnosticTool/GP_Diagnostic/Analysis/Tasks/GpCustomerPhoneNumberAlphaTask.cs b/samples/DynamicsGPDiagnosticTool/GP_Diagnostic/Analysis/Tasks/GpCustomerPhoneNumberAlphaTask.cs
index db1673e3..78a310b9 100644
--- a/samples/DynamicsGPDiagnosticTool/GP_Diagnostic/Analysis/Tasks/GpCustomerPhoneNumberAlphaTask.cs
+++ b/samples/DynamicsGPDiagnosticTool/GP_Diagnostic/Analysis/Tasks/GpCustomerPhoneNumberAlphaTask.cs
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 
 /// <summary>
-/// A task to determine customer phone numbers with alpha characters.
+/// A task to determine customer phone or fax numbers with alpha characters.
 /// </summary>
 public class GpCustomerPhoneNumberAlphaTask : IDiagnosticTask
 {
@@ -50,7 +50,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
 FROM
     [RM00101]
 WHERE
-    [PHONE1] LIKE '%[^0-9 ]%'
+    ([PHONE1] LIKE '%[^0-9 ]%' OR [FAX] LIKE '%[^0-9 ]%')
     AND [INACTIVE] = 0 --Remove to include all Customers";
 
         using (var reader = await this.database.ExecuteSqlAsync(sql, cancellationToken))
diff --git a/samples/DynamicsGPDiagnosticTool/GP_Diagnostic/Analysis/Tasks/GpVendorPhoneNumberAlphaTask.cs b/samples/DynamicsGPDiagnosticTool/GP_Diagnostic/Analysis/Tasks/GpVendorPhoneNumberAlphaTask.cs
index 52be8119..b4ebfc9f 100644
--- a/samples/DynamicsGPDiagnosticTool/GP_Diagnostic/Analysis/Tasks/GpVendorPhoneNumberAlphaTask.cs
+++ b/samples/DynamicsGPDiagnosticTool/GP_Diagnostic/Analysis/Tasks/GpVendorPhoneNumberAlphaTask.cs
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 
 /// <summary>
-/// A task to determine vendor phone numbers with alpha characters.
+/// A task to determine vendor phone or fax numbers with alpha characters.
 /// </summary>
 public class GpVendorPhoneNumberAlphaTask : IDiagnosticTask
 {
@@ -50,7 +50,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
 FROM
     [PM00200]
 WHERE
-    [PHNUMBR1] LIKE '%[^0-9 ]%'
+    ([PHNUMBR1] LIKE '%[^0-9 ]%' OR [FAXNUMBR] LIKE '%[^0-9 ]%')
     AND VENDSTTS = 1 --Remove to include all Vendors";
 
         using (var reader = await this.database.ExecuteSqlAsync(sql, cancellationToken))
diff --git a/samples/DynamicsGPDiagnosticTool/GP_Diagnostic/Resources.Designer.cs b/samples/DynamicsGPDiagnosticTool/GP_Diagnostic/Resources.Designer.cs
index ab052852..d9bf1fdb 100644
--- a/samples/DynamicsGPDiagnosticTool/GP_Diagnostic/Resources.Designer.cs
+++ b/samples/DynamicsGPDiagnosticTool/GP_Diagnostic/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Microsoft.GP.MigrationDiagnostic {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -271,7 +271,7 @@ internal static string GpCustomerNumberSpacePrefixTaskSummary {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Active customer phone numbers with alpha characters.
+        ///   Looks up a localized string similar to Active customers with alpha characters in phone/fax numbers.
         /// </summary>
         internal static string GpCustomerPhoneNumberAlphaTaskDescription {
             get {
@@ -280,7 +280,7 @@ internal static string GpCustomerPhoneNumberAlphaTaskDescription {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} active customer(s) with phone numbers that contain alpha characters. Business Central does not allow alpha characters in phone numbers. The Customers will still be migrated, but the phone numbers will be skipped..
+        ///   Looks up a localized string similar to {0} active customer(s) with alpha characters in phone/fax numbers. Business Central does not allow alpha characters in phone or fax numbers. The Customers will still be migrated, but the phone/fax numbers will be skipped..
         /// </summary>
         internal static string GpCustomerPhoneNumberAlphaTaskSummary {
             get {
@@ -766,7 +766,7 @@ internal static string GpVendorNumberSpacePrefixTaskSummary {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Active vendor phone numbers with alpha characters.
+        ///   Looks up a localized string similar to Active vendors with alpha characters in phone/fax numbers.
         /// </summary>
         internal static string GpVendorPhoneNumberAlphaTaskDescription {
             get {
@@ -775,7 +775,7 @@ internal static string GpVendorPhoneNumberAlphaTaskDescription {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} active vendor(s) detected with phone numbers that contain alpha characters. Business Central does not allow alpha characters in phone numbers. The vendors will still be migrated, but the phone numbers will be skipped..
+        ///   Looks up a localized string similar to {0} active vendor(s) detected with alpha characters in phone/fax numbers. Business Central does not allow alpha characters in phone or fax numbers. The vendors will still be migrated, but the phone/fax numbers will be skipped..
         /// </summary>
         internal static string GpVendorPhoneNumberAlphaTaskSummary {
             get {
diff --git a/samples/DynamicsGPDiagnosticTool/GP_Diagnostic/Resources.resx b/samples/DynamicsGPDiagnosticTool/GP_Diagnostic/Resources.resx
index 076d4697..3e3e9a64 100644
--- a/samples/DynamicsGPDiagnosticTool/GP_Diagnostic/Resources.resx
+++ b/samples/DynamicsGPDiagnosticTool/GP_Diagnostic/Resources.resx
@@ -184,10 +184,10 @@
     <comment>{0} = Number of customers</comment>
   </data>
   <data name="GpCustomerPhoneNumberAlphaTaskDescription" xml:space="preserve">
-    <value>Active customer phone numbers with alpha characters</value>
+    <value>Active customers with alpha characters in phone/fax numbers</value>
   </data>
   <data name="GpCustomerPhoneNumberAlphaTaskSummary" xml:space="preserve">
-    <value>{0} active customer(s) with phone numbers that contain alpha characters. Business Central does not allow alpha characters in phone numbers. The Customers will still be migrated, but the phone numbers will be skipped.</value>
+    <value>{0} active customer(s) with alpha characters in phone/fax numbers. Business Central does not allow alpha characters in phone or fax numbers. The Customers will still be migrated, but the phone/fax numbers will be skipped.</value>
     <comment>{0} = Number of customers</comment>
   </data>
   <data name="GpDirectTransactionsPostingToRetainedEarningsAccountTaskDescription" xml:space="preserve">
@@ -363,10 +363,10 @@
     <comment>{0} = Number of vendors</comment>
   </data>
   <data name="GpVendorPhoneNumberAlphaTaskDescription" xml:space="preserve">
-    <value>Active vendor phone numbers with alpha characters</value>
+    <value>Active vendors with alpha characters in phone/fax numbers</value>
   </data>
   <data name="GpVendorPhoneNumberAlphaTaskSummary" xml:space="preserve">
-    <value>{0} active vendor(s) detected with phone numbers that contain alpha characters. Business Central does not allow alpha characters in phone numbers. The vendors will still be migrated, but the phone numbers will be skipped.</value>
+    <value>{0} active vendor(s) detected with alpha characters in phone/fax numbers. Business Central does not allow alpha characters in phone or fax numbers. The vendors will still be migrated, but the phone/fax numbers will be skipped.</value>
     <comment>{0} = Number of vendors</comment>
   </data>
   <data name="GpVerifyPostingTypesTaskDescription" xml:space="preserve">