diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java b/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java
index 4ffea72995d..ee5792850c5 100644
--- a/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java
@@ -34,6 +34,7 @@ public class DynamicSwaggerConfig extends BeanConfig {
                     b.append(client);
                 }
                 param.setDescription("available clients: " + b.toString());
+                param.setEnum(clients);
             }
         }
 
@@ -51,7 +52,8 @@ public class DynamicSwaggerConfig extends BeanConfig {
                     }
                     b.append(server);
                 }
-                param.setDescription("available clients: " + b.toString());
+                param.setDescription("available servers: " + b.toString());
+                param.setEnum(servers);
             }
         }
 
@@ -70,4 +72,4 @@ public class DynamicSwaggerConfig extends BeanConfig {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java
index 4b4494977eb..ddfd6fa3950 100644
--- a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java
@@ -64,7 +64,7 @@ public class SwaggerResource {
             tags = "clients")
     public Response generateClient(
             @Context HttpServletRequest request,
-            @ApiParam(value = "The target language for the client library", allowableValues = "android,java,php,objc,docs", required = true) @PathParam("language") String language,
+            @ApiParam(value = "The target language for the client library", required = true) @PathParam("language") String language,
             @ApiParam(value = "Configuration for building the client library", required = true) GeneratorInput opts) throws Exception {
 
         String filename = Generator.generateClient(language, opts);
@@ -115,7 +115,7 @@ public class SwaggerResource {
             tags = "servers")
     public Response generateServerForLanguage(
             @Context HttpServletRequest request,
-            @ApiParam(value = "framework", allowableValues = "jaxrs,nodejs", required = true) @PathParam("framework") String framework,
+            @ApiParam(value = "framework", required = true) @PathParam("framework") String framework,
             @ApiParam(value = "parameters", required = true) GeneratorInput opts)
             throws Exception {
         if (framework == null) {