diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenParameter.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenParameter.java
index 04cecabad90..8dc9991daed 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenParameter.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenParameter.java
@@ -3,7 +3,7 @@ package com.wordnik.swagger.codegen;
 public class CodegenParameter {
   public Boolean isFormParam, isQueryParam, isPathParam, isHeaderParam,
     isCookieParam, isBodyParam, isFile, notFile, hasMore, isContainer, secondaryParam;
-  public String baseName, paramName, dataType, collectionFormat, description, baseType;
+  public String baseName, paramName, dataType, collectionFormat, description, baseType, defaultValue;
   public String jsonSchema;
 
   /**
@@ -34,7 +34,8 @@ public class CodegenParameter {
     output.isBodyParam = this.isBodyParam;
     output.required = this.required;
     output.jsonSchema = this.jsonSchema;
+    output.defaultValue = this.defaultValue;
 
     return output;
   }
-}
\ No newline at end of file
+}
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
index 499d92b3a4e..5fe96d28862 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
@@ -939,6 +939,15 @@ public class DefaultCodegen {
       p.required = param.getRequired();
     p.jsonSchema = Json.pretty(param);
 
+    // move the defaultValue for headers, forms and params
+    if(param instanceof QueryParameter) {
+        p.defaultValue = ((QueryParameter)param).getDefaultValue();
+    } else if(param instanceof HeaderParameter) {
+    	p.defaultValue = ((HeaderParameter)param).getDefaultValue();
+    } else if(param instanceof FormParameter) {
+    	p.defaultValue = ((FormParameter)param).getDefaultValue();
+    }
+
     if(param instanceof SerializableParameter) {
       SerializableParameter qp = (SerializableParameter) param;
       Property property = null;
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/formParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/formParams.mustache
index 83c928ea92e..402a684f86a 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/formParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/formParams.mustache
@@ -1,2 +1,2 @@
 {{#isFormParam}}{{#notFile}}
-@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@RequestPart("{{paramName}}")  {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}@ApiParam(value = "file detail") @RequestPart("file") MultipartFile fileDetail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
+@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @RequestPart(value="{{paramName}}"{{#required}}, required=true{{/required}}{{^required}}, required=false{{/required}})  {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}@ApiParam(value = "file detail") @RequestPart("file") MultipartFile fileDetail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/queryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/queryParams.mustache
index 313289d9eaf..3bb2afcb6cd 100755
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/queryParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/queryParams.mustache
@@ -1 +1 @@
-{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) @RequestParam(value = "{{paramName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
+{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) @RequestParam(value = "{{paramName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{{dataType}}} {{paramName}}{{/isQueryParam}}