diff --git a/src/siteSettings/components/SiteSettingsMailing/SiteSettingsMailing.tsx b/src/siteSettings/components/SiteSettingsMailing/SiteSettingsMailing.tsx
index 69d817967..3a619ed58 100644
--- a/src/siteSettings/components/SiteSettingsMailing/SiteSettingsMailing.tsx
+++ b/src/siteSettings/components/SiteSettingsMailing/SiteSettingsMailing.tsx
@@ -11,11 +11,17 @@ import CardTitle from "@saleor/components/CardTitle";
 import FormSpacer from "@saleor/components/FormSpacer";
 import Hr from "@saleor/components/Hr";
 import { FormErrors } from "@saleor/types";
-import { SiteSettingsPageFormData } from "../SiteSettingsPage";
 
+export interface SiteSettingsMailingFormData {
+  defaultMailSenderName: string;
+  defaultMailSenderAddress: string;
+  passwordResetUrl: string;
+}
 interface SiteSettingsMailingProps {
-  data: SiteSettingsPageFormData;
-  errors: FormErrors<"email" | "passwordResetUrl">;
+  data: SiteSettingsMailingFormData;
+  errors: FormErrors<
+    "defaultMailSenderAddress" | "defaultMailSenderName" | "passwordResetUrl"
+  >;
   disabled: boolean;
   onChange: (event: React.ChangeEvent<any>) => void;
 }
@@ -61,14 +67,33 @@ const SiteSettingsMailing: React.FC<SiteSettingsMailingProps> = props => {
         </Typography>
         <TextField
           disabled={disabled}
-          error={!!errors.email}
+          error={!!errors.defaultMailSenderAddress}
           fullWidth
-          name="email"
+          name="defaultMailSenderAddress"
           label={intl.formatMessage({
             defaultMessage: "Mailing email address"
           })}
-          helperText={errors.email}
-          value={data.name}
+          helperText={errors.defaultMailSenderAddress}
+          value={data.defaultMailSenderAddress}
+          onChange={onChange}
+        />
+        <FormSpacer />
+        <TextField
+          disabled={disabled}
+          error={!!errors.defaultMailSenderName}
+          fullWidth
+          name="defaultMailSenderAddress"
+          label={intl.formatMessage({
+            defaultMessage: "Mailing email sender"
+          })}
+          helperText={
+            errors.defaultMailSenderName ||
+            intl.formatMessage({
+              defaultMessage: 'This will be visible as "from" name',
+              description: "email sender"
+            })
+          }
+          value={data.defaultMailSenderAddress}
           onChange={onChange}
         />
         <FormSpacer />
@@ -89,7 +114,7 @@ const SiteSettingsMailing: React.FC<SiteSettingsMailingProps> = props => {
                 "This URL will be used as a main URL for password resets. It will be sent via email."
             })
           }
-          value={data.domain}
+          value={data.passwordResetUrl}
           onChange={onChange}
         />
       </CardContent>
diff --git a/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx b/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx
index 890874836..4f7d77524 100644
--- a/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx
+++ b/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx
@@ -23,7 +23,9 @@ import { SiteSettings_shop } from "../../types/SiteSettings";
 import SiteSettingsAddress from "../SiteSettingsAddress/SiteSettingsAddress";
 import SiteSettingsDetails from "../SiteSettingsDetails/SiteSettingsDetails";
 import SiteSettingsKeys from "../SiteSettingsKeys/SiteSettingsKeys";
-import SiteSettingsMailing from "../SiteSettingsMailing";
+import SiteSettingsMailing, {
+  SiteSettingsMailingFormData
+} from "../SiteSettingsMailing";
 
 export interface SiteSettingsPageAddressFormData {
   city: string;
@@ -37,12 +39,11 @@ export interface SiteSettingsPageAddressFormData {
 }
 
 export interface SiteSettingsPageFormData
-  extends SiteSettingsPageAddressFormData {
+  extends SiteSettingsPageAddressFormData,
+    SiteSettingsMailingFormData {
   description: string;
   domain: string;
-  email: string;
   name: string;
-  passwordResetUrl: string;
 }
 
 export interface SiteSettingsPageProps {