diff --git a/cmd/campaigns.go b/cmd/campaigns.go
index 17fcaadd..69337c48 100644
--- a/cmd/campaigns.go
+++ b/cmd/campaigns.go
@@ -47,7 +47,7 @@ type campaignContentReq struct {
 }
 
 var (
-	regexFromAddress = regexp.MustCompile(`(.+?)\s<(.+?)@(.+?)>`)
+	regexFromAddress = regexp.MustCompile(`((.+?)\s)?<(.+?)@(.+?)>`)
 )
 
 // handleGetCampaigns handles retrieval of campaigns.
diff --git a/frontend/src/views/settings/general.vue b/frontend/src/views/settings/general.vue
index 8b0a6d42..df8d78fd 100644
--- a/frontend/src/views/settings/general.vue
+++ b/frontend/src/views/settings/general.vue
@@ -32,7 +32,7 @@
     <b-field :label="$t('settings.general.fromEmail')" label-position="on-border"
       :message="$t('settings.general.fromEmailHelp')">
       <b-input v-model="data['app.from_email']" name="app.from_email"
-        placeholder="Listmonk <noreply@listmonk.yoursite.com>" pattern="(.+?)\s<(.+?)@(.+?)>" :maxlength="300" />
+        placeholder="Listmonk <noreply@listmonk.yoursite.com>" pattern="((.+?)\s)?<(.+?)@(.+?)>" :maxlength="300" />
     </b-field>
     <b-field :label="$t('settings.general.adminNotifEmails')" label-position="on-border"
       :message="$t('settings.general.adminNotifEmailsHelp')">