diff --git a/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/app/index.js b/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/app/index.js
index e2c98499d9..bf83f1c332 100644
--- a/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/app/index.js
+++ b/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/app/index.js
@@ -16,6 +16,8 @@ const templateName = "sample-assistant";
 const languages = [`zh`, `de`, `en`, `fr`, `it`, `es`];
 let assistantGenerationPath = process.cwd();
 let isAlreadyCreated = false;
+let containsSpecialCharacter = false;
+let finalAssistantName = "";
 
 const languagesChoice = [
   {
@@ -254,6 +256,11 @@ module.exports = class extends Generator {
       /([^a-z0-9-]+)/gi,
       ``
     );
+    
+    if (this.props.assistantName != assistantName) {
+      finalAssistantName = assistantName;
+      containsSpecialCharacter = true;
+    }
 
     assistantGenerationPath = path.join(assistantGenerationPath, assistantName);
     if (this.props.assistantGenerationPath !== undefined) {
@@ -328,6 +335,9 @@ module.exports = class extends Generator {
         );
       } else {
         this.spawnCommandSync("npm run build", []);
+        if (containsSpecialCharacter) {
+          this.log(chalk.yellow(`\nYour virtual assistant name (${this.props.assistantName}) had special characters, it was changed to '${finalAssistantName}'`));
+        }
         this.log(chalk.green(`------------------------ `));
         this.log(chalk.green(` Your new assistant is ready!  `));
         this.log(chalk.green(`------------------------ `));
diff --git a/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/index.js b/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/index.js
index 61e2f86ba4..2b2f1b3cb6 100644
--- a/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/index.js
+++ b/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/index.js
@@ -16,7 +16,8 @@ const templateName = "sample-skill";
 const languages = [`zh`, `de`, `en`, `fr`, `it`, `es`];
 let skillGenerationPath = process.cwd();
 let isAlreadyCreated = false;
-
+let containsSpecialCharacter = false;
+let finalSkillName = "";
 const languagesChoice = [
   {
     name: "Chinese",
@@ -256,6 +257,11 @@ module.exports = class extends Generator {
         skillName
       );
     }
+    
+    if (this.props.skillName != skillName) {
+      finalSkillName = skillName;
+      containsSpecialCharacter = true;
+    }
 
     const skillNameCamelCase = _camelCase(this.props.skillName).replace(
       /([^a-z0-9-]+)/gi,
@@ -320,6 +326,9 @@ module.exports = class extends Generator {
         );
       } else {
         this.spawnCommandSync("npm run build", []);
+        if (containsSpecialCharacter) {
+          this.log(chalk.yellow(`\nYour skill name (${this.props.skillName}) had special characters, it was changed to '${finalSkillName}'`));
+        }
         this.log(chalk.green(`------------------------ `));
         this.log(chalk.green(` Your new skill is ready!  `));
         this.log(chalk.green(`------------------------ `));