diff --git a/modules/swagger-codegen/src/main/resources/aspnetcore/enumClass.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/enumClass.mustache
index 3c1d6e15d6a..ce4e3054ea3 100644
--- a/modules/swagger-codegen/src/main/resources/aspnetcore/enumClass.mustache
+++ b/modules/swagger-codegen/src/main/resources/aspnetcore/enumClass.mustache
@@ -8,6 +8,6 @@
             /// Enum {{name}} for {{{value}}}
             /// </summary>
             [EnumMember(Value = {{#isLong}}"{{/isLong}}{{#isInteger}}"{{/isInteger}}{{#isFloat}}"{{/isFloat}}{{#isDouble}}"{{/isDouble}}{{{value}}}{{#isLong}}"{{/isLong}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isFloat}}"{{/isFloat}})]
-            {{name}}{{#isLong}} = {{{value}}}{{/isLong}}{{#isInteger}} = {{{value}}}{{/isInteger}}{{^-last}},
+            {{name}}{{#isLong}} = {{{value}}}{{/isLong}}{{#isInteger}} = {{{value}}}{{/isInteger}}{{^isInteger}} = {{-index}}{{/isInteger}}{{^-last}},
             {{/-last}}{{/enumVars}}{{/allowableValues}}
         }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/enumClass.mustache b/modules/swagger-codegen/src/main/resources/csharp/enumClass.mustache
index d8d5d4185dd..015e7142dbc 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/enumClass.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/enumClass.mustache
@@ -12,6 +12,6 @@
             /// Enum {{name}} for {{{value}}}
             /// </summary>
             [EnumMember(Value = {{#isLong}}"{{/isLong}}{{#isInteger}}"{{/isInteger}}{{#isFloat}}"{{/isFloat}}{{#isDouble}}"{{/isDouble}}{{{value}}}{{#isLong}}"{{/isLong}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isFloat}}"{{/isFloat}})]
-            {{name}}{{#isLong}} = {{{value}}}{{/isLong}}{{#isInteger}} = {{{value}}}{{/isInteger}}{{^-last}},
+            {{name}}{{#isLong}} = {{{value}}}{{/isLong}}{{#isInteger}} = {{{value}}}{{/isInteger}}{{^isInteger}} = {{-index}}{{/isInteger}}{{^-last}},
             {{/-last}}{{/enumVars}}{{/allowableValues}}
         }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/modelEnum.mustache b/modules/swagger-codegen/src/main/resources/csharp/modelEnum.mustache
index 64e50883f8d..23f575bb06f 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/modelEnum.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/modelEnum.mustache
@@ -12,6 +12,6 @@
         /// Enum {{name}} for {{{value}}}
         /// </summary>
         [EnumMember(Value = {{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}})]
-        {{name}}{{#isInteger}} = {{{value}}}{{/isInteger}}{{^-last}},
+        {{name}}{{#isInteger}} = {{{value}}}{{/isInteger}}{{^isInteger}} = {{-index}}{{/isInteger}}{{^-last}},
         {{/-last}}{{/enumVars}}{{/allowableValues}}
     }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/modelInnerEnum.mustache b/modules/swagger-codegen/src/main/resources/csharp/modelInnerEnum.mustache
index 7af083a925f..674ab033d01 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/modelInnerEnum.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/modelInnerEnum.mustache
@@ -13,7 +13,7 @@
             /// Enum {{name}} for {{{value}}}
             /// </summary>
             [EnumMember(Value = {{#isLong}}"{{/isLong}}{{#isInteger}}"{{/isInteger}}{{#isFloat}}"{{/isFloat}}{{#isDouble}}"{{/isDouble}}{{{value}}}{{#isLong}}"{{/isLong}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isFloat}}"{{/isFloat}})]
-            {{name}}{{#isLong}} = {{{value}}}{{/isLong}}{{#isInteger}} = {{{value}}}{{/isInteger}}{{^-last}},
+            {{name}}{{#isLong}} = {{{value}}}{{/isLong}}{{#isInteger}} = {{{value}}}{{/isInteger}}{{^isInteger}} = {{-index}}{{/isInteger}}{{^-last}},
             {{/-last}}{{/enumVars}}{{/allowableValues}}
         }
         {{/isContainer}}
diff --git a/modules/swagger-codegen/src/main/resources/nancyfx/innerApiEnum.mustache b/modules/swagger-codegen/src/main/resources/nancyfx/innerApiEnum.mustache
index 0c6a219e7bb..586b0e423c7 100644
--- a/modules/swagger-codegen/src/main/resources/nancyfx/innerApiEnum.mustache
+++ b/modules/swagger-codegen/src/main/resources/nancyfx/innerApiEnum.mustache
@@ -4,7 +4,7 @@
     public enum {{>innerApiEnumName}}
     {
     {{#allowableValues}}
-{{#values}}        {{&.}}{{^-last}}, {{/-last}}
+{{#values}}        {{&.}}{{^isInteger}} = {{-index}}{{/isInteger}}{{^-last}}, {{/-last}}
 {{/values}}
     {{/allowableValues}}
     };
diff --git a/modules/swagger-codegen/src/main/resources/nancyfx/modelEnum.mustache b/modules/swagger-codegen/src/main/resources/nancyfx/modelEnum.mustache
index 8d29373d205..303e4c71c26 100644
--- a/modules/swagger-codegen/src/main/resources/nancyfx/modelEnum.mustache
+++ b/modules/swagger-codegen/src/main/resources/nancyfx/modelEnum.mustache
@@ -10,6 +10,6 @@
         /// <summary>
         /// Enum {{name}}
         /// </summary>
-        {{name}}{{#isInteger}} = {{{value}}}{{/isInteger}}{{^-last}},
+        {{name}}{{#isInteger}} = {{{value}}}{{/isInteger}}{{^isInteger}} = {{-index}}{{/isInteger}}{{^-last}},
         {{/-last}}{{/enumVars}}{{/allowableValues}}
-    }
\ No newline at end of file
+    }
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/csharp/general/enum-support-expected/src/IO.Swagger/Model/MyClassWithOptionalInlineEnum.cs b/modules/swagger-codegen/src/test/resources/integrationtests/csharp/general/enum-support-expected/src/IO.Swagger/Model/MyClassWithOptionalInlineEnum.cs
index 2146daae4de..f0232199d26 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/csharp/general/enum-support-expected/src/IO.Swagger/Model/MyClassWithOptionalInlineEnum.cs
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/csharp/general/enum-support-expected/src/IO.Swagger/Model/MyClassWithOptionalInlineEnum.cs
@@ -41,43 +41,43 @@ public enum DaysEnum
             /// Enum Sun for "sun"
             /// </summary>
             [EnumMember(Value = "sun")]
-            Sun,
+            Sun = 1,
             
             /// <summary>
             /// Enum Mon for "mon"
             /// </summary>
             [EnumMember(Value = "mon")]
-            Mon,
+            Mon = 2,
             
             /// <summary>
             /// Enum Tue for "tue"
             /// </summary>
             [EnumMember(Value = "tue")]
-            Tue,
+            Tue = 3,
             
             /// <summary>
             /// Enum Wed for "wed"
             /// </summary>
             [EnumMember(Value = "wed")]
-            Wed,
+            Wed = 4,
             
             /// <summary>
             /// Enum Thu for "thu"
             /// </summary>
             [EnumMember(Value = "thu")]
-            Thu,
+            Thu = 5,
             
             /// <summary>
             /// Enum Fri for "fri"
             /// </summary>
             [EnumMember(Value = "fri")]
-            Fri,
+            Fri = 6,
             
             /// <summary>
             /// Enum Sat for "sat"
             /// </summary>
             [EnumMember(Value = "sat")]
-            Sat
+            Sat = 7
         }
 
         /// <summary>
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/csharp/general/enum-support-expected/src/IO.Swagger/Model/MyClassWithRequiredInlineEnum.cs b/modules/swagger-codegen/src/test/resources/integrationtests/csharp/general/enum-support-expected/src/IO.Swagger/Model/MyClassWithRequiredInlineEnum.cs
index fb43dccce3f..1d461a4e558 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/csharp/general/enum-support-expected/src/IO.Swagger/Model/MyClassWithRequiredInlineEnum.cs
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/csharp/general/enum-support-expected/src/IO.Swagger/Model/MyClassWithRequiredInlineEnum.cs
@@ -41,43 +41,43 @@ public enum DaysEnum
             /// Enum Sun for "sun"
             /// </summary>
             [EnumMember(Value = "sun")]
-            Sun,
+            Sun = 1,
             
             /// <summary>
             /// Enum Mon for "mon"
             /// </summary>
             [EnumMember(Value = "mon")]
-            Mon,
+            Mon = 2,
             
             /// <summary>
             /// Enum Tue for "tue"
             /// </summary>
             [EnumMember(Value = "tue")]
-            Tue,
+            Tue = 3,
             
             /// <summary>
             /// Enum Wed for "wed"
             /// </summary>
             [EnumMember(Value = "wed")]
-            Wed,
+            Wed = 4,
             
             /// <summary>
             /// Enum Thu for "thu"
             /// </summary>
             [EnumMember(Value = "thu")]
-            Thu,
+            Thu = 5,
             
             /// <summary>
             /// Enum Fri for "fri"
             /// </summary>
             [EnumMember(Value = "fri")]
-            Fri,
+            Fri = 6,
             
             /// <summary>
             /// Enum Sat for "sat"
             /// </summary>
             [EnumMember(Value = "sat")]
-            Sat
+            Sat = 7
         }
 
         /// <summary>
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/csharp/general/enum-support-expected/src/IO.Swagger/Model/WeekDays.cs b/modules/swagger-codegen/src/test/resources/integrationtests/csharp/general/enum-support-expected/src/IO.Swagger/Model/WeekDays.cs
index ae81432d79b..e51a01de8fa 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/csharp/general/enum-support-expected/src/IO.Swagger/Model/WeekDays.cs
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/csharp/general/enum-support-expected/src/IO.Swagger/Model/WeekDays.cs
@@ -35,43 +35,43 @@ public enum WeekDays
         /// Enum Sun for "sun"
         /// </summary>
         [EnumMember(Value = "sun")]
-        Sun,
+        Sun = 1,
         
         /// <summary>
         /// Enum Mon for "mon"
         /// </summary>
         [EnumMember(Value = "mon")]
-        Mon,
+        Mon = 2,
         
         /// <summary>
         /// Enum Tue for "tue"
         /// </summary>
         [EnumMember(Value = "tue")]
-        Tue,
+        Tue = 3,
         
         /// <summary>
         /// Enum Wed for "wed"
         /// </summary>
         [EnumMember(Value = "wed")]
-        Wed,
+        Wed = 4,
         
         /// <summary>
         /// Enum Thu for "thu"
         /// </summary>
         [EnumMember(Value = "thu")]
-        Thu,
+        Thu = 5,
         
         /// <summary>
         /// Enum Fri for "fri"
         /// </summary>
         [EnumMember(Value = "fri")]
-        Fri,
+        Fri = 6,
         
         /// <summary>
         /// Enum Sat for "sat"
         /// </summary>
         [EnumMember(Value = "sat")]
-        Sat
+        Sat = 7
     }
 
 }