diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab/html.hbs
index 1f7e6af1ff..701b179b93 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab/html.hbs
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab/html.hbs
@@ -105,10 +105,10 @@
     <legend>{{tr "Override Network Values IPv6"}}</legend>
     <div class="row">
       <div class="medium-6 columns">
-        <label for="IP6_GLOBAL">
+        <label for="IP6">
           {{tr "IP"}}
         </label>
-        <input type="text" wizard_field="IP6_GLOBAL" id="IP6_GLOBAL" name="IP6_GLOBAL" size="3" />
+        <input type="text" wizard_field="IP6" id="IP6" name="IP6" size="3" />
       </div>
       <div class="medium-6 columns">
         <label for="GATEWAY6">
diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate.js b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate.js
index 66b3e8318c..c78bfa6291 100644
--- a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate.js
+++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate.js
@@ -91,6 +91,7 @@ define(function(require) {
     NicsSection.insert({},
       $(".nicsContext", context),
       { floatingIP: true,
+        forceIPv6:true,
         forceIPv4:true,
         management: true,
         securityGroups: Config.isFeatureEnabled("secgroups")});
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic.js b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic.js
index d18b27592d..5ade152f08 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic.js
@@ -70,6 +70,7 @@ define(function(require) {
     NicsSection.insert({},
       $(".nicsContext", context),
       { floatingIP: true,
+        forceIPv6:true,
         forceIPv4:true,
         management: true,
         securityGroups: Config.isFeatureEnabled("secgroups"),
diff --git a/src/sunstone/public/app/utils/nics-section.js b/src/sunstone/public/app/utils/nics-section.js
index 6a7ecea7bd..49517d6022 100644
--- a/src/sunstone/public/app/utils/nics-section.js
+++ b/src/sunstone/public/app/utils/nics-section.js
@@ -145,6 +145,15 @@ define(function(require) {
         }
       }
 
+      var ip6 = $("input.manual_ip6", $(this)).val();
+
+      if (ip6 != undefined){
+        delete nic["IP6"];
+
+        if (ip6 != ""){
+          nic["IP6"] = ip6;
+        }
+      }
       delete nic["VROUTER_MANAGEMENT"];
 
       if ($("input.management", $(this)).prop("checked")){
diff --git a/src/sunstone/public/app/utils/nics-section/dd.hbs b/src/sunstone/public/app/utils/nics-section/dd.hbs
index 22d3b5e0ee..8c43980bf1 100644
--- a/src/sunstone/public/app/utils/nics-section/dd.hbs
+++ b/src/sunstone/public/app/utils/nics-section/dd.hbs
@@ -63,6 +63,23 @@
       </div>
       {{/if}}
     </div>
+    <div class="row">
+      {{#if options.forceIPv6}}
+        <div class="medium-6 columns">
+          <label>
+            {{tr "Force IPv6:"}}
+            <span class="tip">
+              {{tr "Optionally, you can force the IP assigned to the network interface."}}
+            </span>
+            {{#if options.nic.IP6}}
+            <input type="text" class="manual_ip6" value="{{options.nic.IP6}}"/>
+            {{else}}
+            <input type="text" class="manual_ip6"/>
+            {{/if}}
+          </label>
+        </div>
+      {{/if}}
+    </div>
     {{#if options.securityGroups}}
     <div class="row collapse">
       <h6>