diff --git a/scm-ui/ui-webapp/src/admin/components/form/GeneralSettings.tsx b/scm-ui/ui-webapp/src/admin/components/form/GeneralSettings.tsx
index cd0124d6c3..41a62298e0 100644
--- a/scm-ui/ui-webapp/src/admin/components/form/GeneralSettings.tsx
+++ b/scm-ui/ui-webapp/src/admin/components/form/GeneralSettings.tsx
@@ -142,15 +142,6 @@ class GeneralSettings extends React.Component<Props> {
               helpText={t("help.releaseFeedUrlHelpText")}
             />
           </div>
-          <div className="column is-half">
-            <InputField
-              label={t("general-settings.mail-domain-name")}
-              onChange={this.handleMailDomainNameChange}
-              value={mailDomainName}
-              disabled={!hasUpdatePermission}
-              helpText={t("help.mailDomainNameHelpText")}
-            />
-          </div>
           <div className="column is-half">
             <Checkbox
               label={t("general-settings.enabled-user-converter")}
@@ -162,6 +153,17 @@ class GeneralSettings extends React.Component<Props> {
             />
           </div>
         </div>
+        <div className="columns">
+          <div className="column is-half">
+            <InputField
+              label={t("general-settings.mail-domain-name")}
+              onChange={this.handleMailDomainNameChange}
+              value={mailDomainName}
+              disabled={!hasUpdatePermission}
+              helpText={t("help.mailDomainNameHelpText")}
+            />
+          </div>
+        </div>
       </div>
     );
   }