diff --git a/src/Core/Services/EmailForwarders/FastmailForwarder.cs b/src/Core/Services/EmailForwarders/FastmailForwarder.cs
index 68e1fcbe3..7380fd0fc 100644
--- a/src/Core/Services/EmailForwarders/FastmailForwarder.cs
+++ b/src/Core/Services/EmailForwarders/FastmailForwarder.cs
@@ -61,7 +61,7 @@ namespace Bit.Core.Services.EmailForwarders
                                         ["description"] = "",
                                         ["url"] = "",
                                         ["emailPrefix"] = "",
-                                        ["forDomain"] = ( null == options.Website ? "" : options.Website )
+                                        ["forDomain"] = options.Website ?? ""
                                     }
                                 }
                             },
diff --git a/src/Core/Services/UsernameGenerationService.cs b/src/Core/Services/UsernameGenerationService.cs
index 1a99927f2..2ed5454fe 100644
--- a/src/Core/Services/UsernameGenerationService.cs
+++ b/src/Core/Services/UsernameGenerationService.cs
@@ -150,8 +150,9 @@ namespace Bit.Core.Services
 
             if (options.ServiceType == ForwardedEmailServiceType.Fastmail)
             {
+                var fastmailEmailOptions = (FastmailForwarderOptions)options.GetForwarderOptions();
                 return await new FastmailForwarder()
-                                    .GenerateAsync(_apiService, (FastmailForwarderOptions)options.GetForwarderOptions());
+                                    .GenerateAsync(_apiService, fastmailEmailOptions);
             }
 
             BaseForwarder<ForwarderOptions> simpleForwarder = null;