diff --git a/bin/javascript-es6-petstore.sh b/bin/javascript-es6-petstore.sh
index a68f2c5b5ca..c9f3b7b6ffd 100755
--- a/bin/javascript-es6-petstore.sh
+++ b/bin/javascript-es6-petstore.sh
@@ -29,6 +29,6 @@ export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/
 ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript/es6 \
 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l javascript \
 -o samples/client/petstore/javascript-es6 \
---additional-properties useEs6=true"
+--additional-properties useES6=true"
 
 java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags
diff --git a/bin/javascript-promise-es6-petstore.sh b/bin/javascript-promise-es6-petstore.sh
index e88788ddde5..ec4e1bda37c 100755
--- a/bin/javascript-promise-es6-petstore.sh
+++ b/bin/javascript-promise-es6-petstore.sh
@@ -29,7 +29,6 @@ export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/
 ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript/es6 \
 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l javascript \
 -o samples/client/petstore/javascript-promise-es6 \
---additional-properties useEs6=true \
---additional-properties usePromises=true"
+--additional-properties usePromises=true,useES6=true"
 
 java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/javascript-es6-petstore.bat b/bin/windows/javascript-es6-petstore.bat
index ff5d07bc51e..5b2e26bb9c8 100644
--- a/bin/windows/javascript-es6-petstore.bat
+++ b/bin/windows/javascript-es6-petstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l javascript -o samples\client\petstore\javascript-es6 --additional-properties useEs6=true
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l javascript -o samples\client\petstore\javascript\es6 --additional-properties useES6=true
 
 java -DappName=PetstoreClient %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/javascript-petstore-all.bat b/bin/windows/javascript-petstore-all.bat
index e0181312d7e..efbde1ac83e 100755
--- a/bin/windows/javascript-petstore-all.bat
+++ b/bin/windows/javascript-petstore-all.bat
@@ -1,3 +1,4 @@
 call .\bin\windows\javascript-petstore.bat
 call .\bin\windows\javascript-promise-petstore.bat
 call .\bin\windows\javascript-es6-petstore.bat
+call .\bin\windows\javascript-promise-es6-petstore.bat
diff --git a/bin/windows/javascript-promise-es6-petstore.bat b/bin/windows/javascript-promise-es6-petstore.bat
index f827e6b8151..1ace9acacca 100644
--- a/bin/windows/javascript-promise-es6-petstore.bat
+++ b/bin/windows/javascript-promise-es6-petstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l javascript -o samples\client\petstore\javascript-promise-es6 --additional-properties useEs6=true --additional-properties usePromises=true
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l javascript -o samples\client\petstore\javascript-promise-es6 --additional-properties useES6=true,usePromises=true
 
 java -DappName=PetstoreClient %JAVA_OPTS% -jar %executable% %ags%
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
index 182f422b381..b430df162b2 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -2511,7 +2511,6 @@ public class DefaultCodegen {
             }
 
         } else {
-            LOGGER.info("proessing body parameter ...");
             if (!(param instanceof BodyParameter)) {
                 LOGGER.error("Cannot use Parameter " + param + " as Body Parameter");
             }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java
index f6545d57aa1..548155035f2 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java
@@ -96,7 +96,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
     protected String modelDocPath = "docs/";
     protected String apiTestPath = "api/";
     protected String modelTestPath = "model/";
-    protected boolean useES6;
+    protected boolean useES6 = false; // default is ES5
 
     public JavascriptClientCodegen() {
         super();
@@ -197,7 +197,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
                 .defaultValue(Boolean.TRUE.toString()));
         cliOptions.add(new CliOption(USE_ES6,
                 "use JavaScript ES6 (ECMAScript 6)")
-                .defaultValue(Boolean.TRUE.toString()));
+                .defaultValue(Boolean.FALSE.toString()));
     }
 
     @Override
@@ -268,6 +268,8 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         }
         if (additionalProperties.containsKey(USE_ES6)) {
             setUseES6(convertPropertyToBooleanAndWriteBack(USE_ES6));
+        } else {
+            setUseES6(false);
         }
     }
 
@@ -432,8 +434,10 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         this.useES6 = useES6;
         if (useES6) {
             embeddedTemplateDir = templateDir = "Javascript/es6";
+            LOGGER.info("Using JS ES6 templates");
         } else {
             embeddedTemplateDir = templateDir = "Javascript";
+            LOGGER.info("Using JS ES5 templates");
         }
     }
 
diff --git a/samples/client/petstore/javascript-es6/.babelrc b/samples/client/petstore/javascript-es6/.babelrc
new file mode 100644
index 00000000000..bcb6ee8de93
--- /dev/null
+++ b/samples/client/petstore/javascript-es6/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015", "stage-0"]
+}
\ No newline at end of file
diff --git a/samples/client/petstore/javascript-promise-es6/.babelrc b/samples/client/petstore/javascript-promise-es6/.babelrc
new file mode 100644
index 00000000000..bcb6ee8de93
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015", "stage-0"]
+}
\ No newline at end of file