diff --git a/Composer/packages/client/src/pages/setting/dialog-settings/DialogSettings.tsx b/Composer/packages/client/src/pages/setting/dialog-settings/DialogSettings.tsx
index defcea5505..27caca3530 100644
--- a/Composer/packages/client/src/pages/setting/dialog-settings/DialogSettings.tsx
+++ b/Composer/packages/client/src/pages/setting/dialog-settings/DialogSettings.tsx
@@ -25,7 +25,7 @@ import {
 import { languageListTemplates } from '../../../components/MultiLanguage';
 import { navigateTo } from '../../../utils/navigation';
 
-import { hostedControls, settingsEditor, toolbar } from './style';
+import { settingsEditor, toolbar } from './style';
 import { BotSettings } from './constants';
 
 export const DialogSettings: React.FC<RouteComponentProps> = () => {
@@ -96,22 +96,20 @@ export const DialogSettings: React.FC<RouteComponentProps> = () => {
   const editorId = [defaultLanguage, ...languages].join('-');
 
   return botName ? (
-    <Stack tokens={{ childrenGap: '3rem' }}>
+    <Stack tokens={{ childrenGap: '1rem' }}>
       <StackItem grow={0}>
-        <div css={hostedControls}>
-          <Label>{BotSettings.generalTitle}</Label>
-          <p>
-            {BotSettings.botSettingDescription}
-            &nbsp;
-            <Link href={'https://aka.ms/bf-composer-docs-publish-bot'} target="_blank">
-              {BotSettings.learnMore}
-            </Link>
-          </p>
-        </div>
+        <Label>{BotSettings.generalTitle}</Label>
+        <section>
+          {BotSettings.botSettingDescription}
+          &nbsp;
+          <Link href={'https://aka.ms/bf-composer-docs-publish-bot'} target="_blank">
+            {BotSettings.learnMore}
+          </Link>
+        </section>
       </StackItem>
       <StackItem>
         <Label>{BotSettings.languageTitle}</Label>
-        <p>{BotSettings.languagesubTitle}</p>
+        <section>{BotSettings.languagesubTitle}</section>
         <section style={{ padding: '0 50px' }}>
           <div css={toolbar}>
             <Dropdown
diff --git a/Composer/packages/client/src/pages/setting/dialog-settings/style.ts b/Composer/packages/client/src/pages/setting/dialog-settings/style.ts
index 4492347b60..f2b7c6139f 100644
--- a/Composer/packages/client/src/pages/setting/dialog-settings/style.ts
+++ b/Composer/packages/client/src/pages/setting/dialog-settings/style.ts
@@ -15,14 +15,6 @@ export const hostedSettings = css`
   box-sizing: border-box;
 `;
 
-export const hostedControls = css`
-  margin-bottom: 18px;
-
-  & > h1 {
-    margin-top: 0;
-  }
-`;
-
 export const settingsEditor = css`
   flex: 1;
   height: 500px;
diff --git a/Composer/packages/server/src/models/bot/luPublisher.ts b/Composer/packages/server/src/models/bot/luPublisher.ts
index 6734b75757..7f94137c06 100644
--- a/Composer/packages/server/src/models/bot/luPublisher.ts
+++ b/Composer/packages/server/src/models/bot/luPublisher.ts
@@ -174,6 +174,7 @@ export class LuPublisher {
       config.botName,
       config.suffix,
       config.fallbackLocal,
+      true,
       false,
       loadResult.multiRecognizers,
       loadResult.settings