diff --git a/app/scripts/directives/addSecretToApplication.js b/app/scripts/directives/addSecretToApplication.js
index c2681b2a9e..57b0d6fb6d 100644
--- a/app/scripts/directives/addSecretToApplication.js
+++ b/app/scripts/directives/addSecretToApplication.js
@@ -84,7 +84,13 @@
     ctrl.$onInit = function() {
       ctrl.addType = 'env';
       ctrl.disableInputs = false;
+
       getApplications();
+
+      var keyValidator = new RegExp("^[A-Za-z_]{1}[A-Za-z0-9_]*$");
+      ctrl.hasInvalidEnvVars = _.some(ctrl.secret.data, function(value, key) {
+        return !keyValidator.test(key);
+      });
     };
 
     ctrl.$postLink = function() {
diff --git a/app/styles/_secrets.less b/app/styles/_secrets.less
index b3b45581a1..a8db01980f 100644
--- a/app/styles/_secrets.less
+++ b/app/styles/_secrets.less
@@ -37,6 +37,10 @@
     }
   }
 
+  .env-warning {
+    margin-left: 20px;
+  }
+
   .updating {
     background-color: @color-pf-white;
     bottom: 55px;
diff --git a/app/views/directives/add-secret-to-application.html b/app/views/directives/add-secret-to-application.html
index 7e88b520c0..86471fb899 100644
--- a/app/views/directives/add-secret-to-application.html
+++ b/app/views/directives/add-secret-to-application.html
@@ -26,18 +26,24 @@ <h3>Add to Application</h3>
         <legend>Add secret as:</legend>
         <div class="form-group">
           <div class="radio">
-            <label class="add-choice" for="envFrom">
-              <input id="envFrom" type="radio" ng-model="ctrl.addType" value="env" ng-disabled="ctrl.disableInputs">
-              Environment variables
-            </label>
+            <div class="add-choice">
+              <label>
+                <input type="radio" ng-model="ctrl.addType" value="env" ng-disabled="ctrl.disableInputs">
+                Environment variables
+              </label>
+              <div class="alert alert-warning  env-warning" ng-show="ctrl.hasInvalidEnvVars">
+                <span class="pficon pficon-warning-triangle-o" aria-hidden="true"></span>
+                <span>Some of the keys for secret <strong>{{ctrl.secret.metadata.name}}</strong> are not valid environment variable names and will not be added.</span>
+              </div>
+            </div>
             <div>
-              <label class="add-choice" for="mountVolume">
-                <input type="radio" ng-model="ctrl.addType" value="volume" ng-disabled="ctrl.disableInputs">
+              <label class="add-choice" for="volume">
+                <input id="volume" type="radio" ng-model="ctrl.addType" value="volume" ng-disabled="ctrl.disableInputs">
                 Volume
               </label>
             </div>
             <div class="volume-options">
-              <div ng-class="{'has-error': (addToApplicationForm.mountVolume.$error.pattern && addToApplicationForm.mountVolume.$touched)}">
+              <div ng-class="{'has-error': (addToApplicationForm.mountVolume.$error.oscUnique || (addToApplicationForm.mountVolume.$error.pattern && addToApplicationForm.mountVolume.$touched))}">
                 <input class="form-control"
                        name="mountVolume"
                        id="mountVolume"
@@ -57,9 +63,9 @@ <h3>Add to Application</h3>
                 Mount Path for the volume. A file will be created in this director for each key from the secret. The file contents will be the value of the key.
               </div>
               <div class="has-error" ng-show="addToApplicationForm.mountVolume.$error.oscUnique">
-              <span class="help-block">
-                The mount path is already used. Please choose another mount path.
-              </span>
+                <span class="help-block">
+                  The mount path is already used. Please choose another mount path.
+                </span>
               </div>
             </div>
           </div>
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
index c836dd4ae5..e6ba464c5d 100644
--- a/dist/scripts/scripts.js
+++ b/dist/scripts/scripts.js
@@ -10629,6 +10629,10 @@ d = _.toArray(e.by("metadata.name")), p();
 };
 m.$onInit = function() {
 m.addType = "env", m.disableInputs = !1, f();
+var e = new RegExp("^[A-Za-z_]{1}[A-Za-z0-9_]*$");
+m.hasInvalidEnvVars = _.some(m.secret.data, function(t, n) {
+return !e.test(n);
+});
 }, m.$postLink = function() {
 t.$watch(function() {
 return m.application;
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index c5f78e530d..bd7c24f38b 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -5567,18 +5567,24 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<legend>Add secret as:</legend>\n" +
     "<div class=\"form-group\">\n" +
     "<div class=\"radio\">\n" +
-    "<label class=\"add-choice\" for=\"envFrom\">\n" +
-    "<input id=\"envFrom\" type=\"radio\" ng-model=\"ctrl.addType\" value=\"env\" ng-disabled=\"ctrl.disableInputs\">\n" +
+    "<div class=\"add-choice\">\n" +
+    "<label>\n" +
+    "<input type=\"radio\" ng-model=\"ctrl.addType\" value=\"env\" ng-disabled=\"ctrl.disableInputs\">\n" +
     "Environment variables\n" +
     "</label>\n" +
+    "<div class=\"alert alert-warning env-warning\" ng-show=\"ctrl.hasInvalidEnvVars\">\n" +
+    "<span class=\"pficon pficon-warning-triangle-o\" aria-hidden=\"true\"></span>\n" +
+    "<span>Some of the keys for secret <strong>{{ctrl.secret.metadata.name}}</strong> are not valid environment variable names and will not be added.</span>\n" +
+    "</div>\n" +
+    "</div>\n" +
     "<div>\n" +
-    "<label class=\"add-choice\" for=\"mountVolume\">\n" +
-    "<input type=\"radio\" ng-model=\"ctrl.addType\" value=\"volume\" ng-disabled=\"ctrl.disableInputs\">\n" +
+    "<label class=\"add-choice\" for=\"volume\">\n" +
+    "<input id=\"volume\" type=\"radio\" ng-model=\"ctrl.addType\" value=\"volume\" ng-disabled=\"ctrl.disableInputs\">\n" +
     "Volume\n" +
     "</label>\n" +
     "</div>\n" +
     "<div class=\"volume-options\">\n" +
-    "<div ng-class=\"{'has-error': (addToApplicationForm.mountVolume.$error.pattern && addToApplicationForm.mountVolume.$touched)}\">\n" +
+    "<div ng-class=\"{'has-error': (addToApplicationForm.mountVolume.$error.oscUnique || (addToApplicationForm.mountVolume.$error.pattern && addToApplicationForm.mountVolume.$touched))}\">\n" +
     "<input class=\"form-control\" name=\"mountVolume\" id=\"mountVolume\" placeholder=\"Enter a mount path\" type=\"text\" required ng-pattern=\"/^\\/.*$/\" osc-unique=\"ctrl.existingMountPaths\" aria-describedby=\"mount-path-help\" ng-disabled=\"ctrl.addType !== 'volume' || ctrl.disableInputs\" ng-model=\"ctrl.mountVolume\" autocorrect=\"off\" autocapitalize=\"off\" spellcheck=\"false\">\n" +
     "</div>\n" +
     "<div class=\"help-block bind-description\">\n" +
diff --git a/dist/styles/main.css b/dist/styles/main.css
index cffc0b0204..8f66f43c08 100644
--- a/dist/styles/main.css
+++ b/dist/styles/main.css
@@ -5320,10 +5320,10 @@ td.visible-print,th.visible-print{display:table-cell!important}
 .add-secret-to-application .dialog-body .add-choice{margin-bottom:10px}
 .add-secret-to-application .dialog-body .button-group .btn{margin-left:10px}
 .add-secret-to-application .dialog-body .button-group .btn:first-of-type{margin-left:0}
+.add-secret-to-application .env-warning,.add-secret-to-application .volume-options{margin-left:20px}
 .add-secret-to-application .dialog-body legend{border-bottom:0;font-size:14px;font-weight:600;margin-bottom:10px}
 .add-secret-to-application .dialog-body .radio{margin-top:0}
 .add-secret-to-application .updating{background-color:#fff;bottom:55px;left:0;padding-top:60px;position:absolute;right:0;top:55px;z-index:1000}
-.add-secret-to-application .volume-options{margin-left:20px}
 .osc-secrets-form .advanced-secrets .help-blocks,.osc-secrets-form .advanced-secrets .input-labels,.osc-secrets-form .basic-secrets .help-blocks,.osc-secrets-form .basic-secrets .input-labels{display:table;padding-right:30px;position:relative;width:100%}
 .osc-secrets-form .advanced-secrets .help-blocks .help-block,.osc-secrets-form .advanced-secrets .help-blocks .input-label,.osc-secrets-form .advanced-secrets .input-labels .help-block,.osc-secrets-form .advanced-secrets .input-labels .input-label,.osc-secrets-form .basic-secrets .help-blocks .help-block,.osc-secrets-form .basic-secrets .help-blocks .input-label,.osc-secrets-form .basic-secrets .input-labels .help-block,.osc-secrets-form .basic-secrets .input-labels .input-label{width:100%;float:left;padding-right:5px}
 .osc-secrets-form .advanced-secrets .secret-row,.osc-secrets-form .basic-secrets .secret-row{display:table;padding-right:30px;position:relative;width:100%;margin-bottom:15px}