diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index abe33d0ed..d163dac83 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -102,9 +102,10 @@
                             </div>
                         </div>
 
-                        <div class="form-group">
+                        <div class="form-group" ng-class="{ 'has-error': !appConfigureForm.xFrameOptions.$dirty && appConfigure.error.xFrameOptions }">
                             <label class="control-label">Allow site embedding from origin</label>
-                            <input type="text" class="form-control" placeholder="https://example.com" ng-model="appConfigure.xFrameOptions" uib-tooltip="Leave blank to not allow embedding">
+                            <div class="control-label" ng-show="appConfigure.error.xFrameOptions"><small>Must be empty of a valid URL</small></div>
+                            <input type="text" class="form-control" id="appConfigureXFrameOptionsInput" name="xFrameOptions" placeholder="https://example.com" ng-model="appConfigure.xFrameOptions" uib-tooltip="Leave blank to not allow embedding">
                         </div>
 
                         <div class="hide">
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js
index 067ab378b..bcb8aceb8 100644
--- a/webadmin/src/views/apps.js
+++ b/webadmin/src/views/apps.js
@@ -201,6 +201,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $scope.appConfigure.error.other = null;
         $scope.appConfigure.error.location = null;
         $scope.appConfigure.error.password = null;
+        $scope.appConfigure.error.xFrameOptions = null;
 
         // only use enabled ports from portBindings
         var finalPortBindings = {};
@@ -240,6 +241,10 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
                     $scope.appConfigure.certificateFile = null;
                     $scope.appConfigure.keyFileName = '';
                     $scope.appConfigure.keyFile = null;
+                } else if (error.statusCode === 400 && error.message.indexOf('xFrameOptions') !== -1 ) {
+                    $scope.appConfigure.error.xFrameOptions = error.message;
+                    $scope.appConfigureForm.xFrameOptions.$setPristine();
+                    $('#appConfigureXFrameOptionsInput').focus();
                 } else {
                     $scope.appConfigure.error.other = error.message;
                 }