From 26283612cf8f74ef1bd8a903b24edcb0ef443902 Mon Sep 17 00:00:00 2001
From: Rui Tome <rtome@bitwarden.com>
Date: Thu, 3 Aug 2023 15:00:03 +0100
Subject: [PATCH] [AC-1360] Added fallback when retrieving display attribute
 name value

---
 src/Admin/Models/CreateProviderModel.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Admin/Models/CreateProviderModel.cs b/src/Admin/Models/CreateProviderModel.cs
index 9cad80ea11..9dcd218fa6 100644
--- a/src/Admin/Models/CreateProviderModel.cs
+++ b/src/Admin/Models/CreateProviderModel.cs
@@ -42,24 +42,24 @@ public class CreateProviderModel : IValidatableObject
             case ProviderType.Msp:
                 if (string.IsNullOrWhiteSpace(OwnerEmail))
                 {
-                    var ownerEmailDisplayName = nameof(OwnerEmail).GetDisplayAttribute<CreateProviderModel>()?.GetName();
+                    var ownerEmailDisplayName = nameof(OwnerEmail).GetDisplayAttribute<CreateProviderModel>()?.GetName() ?? nameof(OwnerEmail);
                     yield return new ValidationResult($"The {ownerEmailDisplayName} field is required.");
                 }
                 break;
             case ProviderType.Reseller:
                 if (string.IsNullOrWhiteSpace(Name))
                 {
-                    var nameDisplayName = nameof(Name).GetDisplayAttribute<CreateProviderModel>()?.GetName();
+                    var nameDisplayName = nameof(Name).GetDisplayAttribute<CreateProviderModel>()?.GetName() ?? nameof(Name);
                     yield return new ValidationResult($"The {nameDisplayName} field is required.");
                 }
                 if (string.IsNullOrWhiteSpace(BusinessName))
                 {
-                    var businessNameDisplayName = nameof(BusinessName).GetDisplayAttribute<CreateProviderModel>()?.GetName();
+                    var businessNameDisplayName = nameof(BusinessName).GetDisplayAttribute<CreateProviderModel>()?.GetName() ?? nameof(BusinessName);
                     yield return new ValidationResult($"The {businessNameDisplayName} field is required.");
                 }
                 if (string.IsNullOrWhiteSpace(BillingEmail))
                 {
-                    var billingEmailDisplayName = nameof(BillingEmail).GetDisplayAttribute<CreateProviderModel>()?.GetName();
+                    var billingEmailDisplayName = nameof(BillingEmail).GetDisplayAttribute<CreateProviderModel>()?.GetName() ?? nameof(BillingEmail);
                     yield return new ValidationResult($"The {billingEmailDisplayName} field is required.");
                 }
                 break;