diff --git a/app/components/templates/templates.html b/app/components/templates/templates.html
index b3af46c04..fb756ed31 100644
--- a/app/components/templates/templates.html
+++ b/app/components/templates/templates.html
@@ -55,8 +55,8 @@
           </div>
           <!-- !name-and-network-inputs -->
           <div ng-repeat="var in selectedTemplate.env" class="form-group">
-            <label for="field_{{ $index }}" class="col-sm-2 control-label text-left">{{ var.label }}</label>
-            <div class="col-sm-10">
+            <label ng-if="!var.default" for="field_{{ $index }}" class="col-sm-2 control-label text-left">{{ var.label }}</label>
+            <div ng-if="!var.default" class="col-sm-10">
               <input type="text" class="form-control" ng-model="var.value" id="field_{{ $index }}">
             </div>
           </div>
diff --git a/app/components/templates/templatesController.js b/app/components/templates/templatesController.js
index 25b69d5c9..753cbc318 100644
--- a/app/components/templates/templatesController.js
+++ b/app/components/templates/templatesController.js
@@ -72,8 +72,9 @@ function createConfigFromTemplate(template) {
   };
   if (template.env) {
     template.env.forEach(function (v) {
-      if (v.value) {
-        containerConfig.Env.push(v.name + "=" + v.value);
+      if (v.value || v.default) {
+        var val = v.default ? v.default : v.value;
+        containerConfig.Env.push(v.name + "=" + val);
       }
     });
   }