diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js
index e58f1ee924..98db6a9b33 100644
--- a/awx/ui/client/src/app.js
+++ b/awx/ui/client/src/app.js
@@ -245,10 +245,9 @@ var tower = angular.module('Tower', [
                     label: "DASHBOARD"
                 },
                 resolve: {
-                    graphData: ['$q', 'jobStatusGraphData', 'FeaturesService', function($q, jobStatusGraphData, FeaturesService) {
+                    graphData: ['$q', 'jobStatusGraphData', function($q, jobStatusGraphData) {
                         return $q.all({
                             jobStatus: jobStatusGraphData.get("month", "all"),
-                            // features: FeaturesService.get()
                         });
                     }]
                 }
@@ -830,10 +829,6 @@ var tower = angular.module('Tower', [
                 });
 
                 $rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState) {
-                    // catch license expiration notifications immediately after user logs in, redirect
-                    // if (fromState.name === 'signIn'){
-                    //     CheckLicense.notify();
-                    // }
 
                     if(fromState.name === 'license' && toParams.hasOwnProperty('licenseMissing')){
                         $rootScope.licenseMissing = toParams.licenseMissing;
diff --git a/awx/ui/client/src/bread-crumb/bread-crumb.directive.js b/awx/ui/client/src/bread-crumb/bread-crumb.directive.js
index 3b3f0a0080..ee1670ecd9 100644
--- a/awx/ui/client/src/bread-crumb/bread-crumb.directive.js
+++ b/awx/ui/client/src/bread-crumb/bread-crumb.directive.js
@@ -1,5 +1,5 @@
 export default
-    ['templateUrl', '$state', 'FeaturesService', 'ProcessErrors', '$rootScope',
+    ['templateUrl', '$state', 'FeaturesService', 'ProcessErrors','$rootScope',
     function(templateUrl, $state, FeaturesService, ProcessErrors, $rootScope) {
         return {
             restrict: 'E',
@@ -11,7 +11,7 @@ export default
                 scope.showActivityStreamButton = false;
                 scope.loadingLicense = true;
 
-                scope.openActivityStream = function() {
+                scope.toggleActivityStream = function() {
 
                     var stateGoParams = {};
 
@@ -29,44 +29,46 @@ export default
 
                 scope.$on("$stateChangeStart", function updateActivityStreamButton(event, toState) {
 
-                   streamConfig = (toState && toState.data) ? toState.data : {};
+                    streamConfig = (toState && toState.data) ? toState.data : {};
 
-                   if(streamConfig && streamConfig.activityStream) {
+                    if(streamConfig && streamConfig.activityStream) {
 
-                       // Check to see if activity_streams is an enabled feature.  $stateChangeSuccess fires
-                       // after the resolve on the state declaration so features should be available at this
-                       // point.  We use the get() function call here just in case the features aren't available.
-                       // The get() function will only fire off the server call if the features aren't already
-                       // attached to the $rootScope.
-                       var features = FeaturesService.get();
-                       if(features){
-                           scope.loadingLicense = false;
-                           scope.activityStreamActive = (toState.name === 'activityStream') ? true : false;
-                           scope.showActivityStreamButton = (FeaturesService.featureEnabled('activity_streams') || toState.name ==='activityStream') ? true : false;
-                       }
-                   }
-                   else {
-                       scope.showActivityStreamButton = false;
+                        // Check to see if activity_streams is an enabled feature.  $stateChangeSuccess fires
+                        // after the resolve on the state declaration so features should be available at this
+                        // point.  We use the get() function call here just in case the features aren't available.
+                        // The get() function will only fire off the server call if the features aren't already
+                        // attached to the $rootScope.
+                        var features = FeaturesService.get();
+                        if(features){
 
-                   }
-               });
+                            scope.loadingLicense = false;
+                            scope.activityStreamActive = (toState.name === 'activityStream') ? true : false;
+                            scope.showActivityStreamButton = (FeaturesService.featureEnabled('activity_streams') || toState.name ==='activityStream') ? true : false;
+                        }
+                    }
+                    else {
 
-               $rootScope.$on('featuresLoaded', function(){
-                   FeaturesService.get()
-                   .then(function() {
-                       scope.loadingLicense = false;
-                       scope.activityStreamActive = ($state.name === 'activityStream') ? true : false;
-                       scope.showActivityStreamButton = (FeaturesService.featureEnabled('activity_streams') || $state.name === 'activityStream') ? true : false;
-                   })
-                   .catch(function (response) {
-                       ProcessErrors(null, response.data, response.status, null, {
-                           hdr: 'Error!',
-                           msg: 'Failed to get feature info. GET returned status: ' +
-                           response.status
-                       });
-                   });
-               });
+                        scope.showActivityStreamButton = false;
 
-           }
-       };
-   }];
+                    }
+                });
+
+                $rootScope.$on('featuresLoaded', function(){
+                    FeaturesService.get()
+                    .then(function() {
+                        scope.loadingLicense = false;
+                        scope.activityStreamActive = ($state.name === 'activityStream') ? true : false;
+                        scope.showActivityStreamButton = (FeaturesService.featureEnabled('activity_streams') || $state.name === 'activityStream') ? true : false;
+                    })
+                    .catch(function (response) {
+                        ProcessErrors(null, response.data, response.status, null, {
+                            hdr: 'Error!',
+                            msg: 'Failed to get feature info. GET returned status: ' +
+                            response.status
+                        });
+                    });
+                });
+
+            }
+        };
+    }];
diff --git a/awx/ui/client/src/bread-crumb/bread-crumb.partial.html b/awx/ui/client/src/bread-crumb/bread-crumb.partial.html
index 5520af9f3a..734de68414 100644
--- a/awx/ui/client/src/bread-crumb/bread-crumb.partial.html
+++ b/awx/ui/client/src/bread-crumb/bread-crumb.partial.html
@@ -8,7 +8,7 @@
         data-container="body"
         ng-class="{'BreadCrumb-menuLinkActive' : activityStreamActive}"
         ng-if="showActivityStreamButton"
-        ng-hide= "loadingLicense || licenseMissing || licenseType == 'basic'"
+        ng-hide= "loadingLicense || licenseMissing"
         ng-click="toggleActivityStream()">
         <i class="BreadCrumb-menuLinkImage icon-activity-stream"
             alt="Activity Stream">
diff --git a/awx/ui/client/src/forms/JobTemplates.js b/awx/ui/client/src/forms/JobTemplates.js
index 06ccbe6f39..c22db173f1 100644
--- a/awx/ui/client/src/forms/JobTemplates.js
+++ b/awx/ui/client/src/forms/JobTemplates.js
@@ -316,7 +316,8 @@ export default
             buttons: { //for now always generates <button> tags
                 add_survey: {
                     ngClick: 'addSurvey()',
-                    ngShow: 'job_type.value !== "scan" && !survey_exists'
+                    ngShow: 'job_type.value !== "scan" && !survey_exists',
+                    awFeature: 'surveys'
                 },
                 edit_survey: {
                     ngClick: 'editSurvey()',
diff --git a/awx/ui/client/src/helpers/Parse.js b/awx/ui/client/src/helpers/Parse.js
index d769bae611..a421b96c0b 100644
--- a/awx/ui/client/src/helpers/Parse.js
+++ b/awx/ui/client/src/helpers/Parse.js
@@ -16,7 +16,8 @@
 
 export default
     angular.module('ParseHelper', ['Utilities', 'AngularCodeMirrorModule'])
-        .factory('ParseTypeChange', ['Alert', 'AngularCodeMirror', function (Alert, AngularCodeMirror) {
+        .factory('ParseTypeChange', ['Alert', 'AngularCodeMirror', '$rootScope',
+        function (Alert, AngularCodeMirror, $rootScope) {
             return function (params) {
 
                 var scope = params.scope,
@@ -45,16 +46,18 @@ export default
 
                 function createField(onChange, onReady) {
                     //hide the textarea and show a fresh CodeMirror with the current mode (json or yaml)
-                    scope.codeMirror = AngularCodeMirror();
-                    scope.codeMirror.addModes($AnsibleConfig.variable_edit_modes);
-                    scope.codeMirror.showTextArea({
-                        scope: scope,
-                        model: fld,
-                        element: field_id,
-                        lineNumbers: true,
-                        mode: scope[pfld],
-                        onReady: onReady,
-                        onChange: onChange
+                    $rootScope.loginConfig.promise.then(function () {
+                        scope.codeMirror = AngularCodeMirror();
+                        scope.codeMirror.addModes($AnsibleConfig.variable_edit_modes);
+                        scope.codeMirror.showTextArea({
+                            scope: scope,
+                            model: fld,
+                            element: field_id,
+                            lineNumbers: true,
+                            mode: scope[pfld],
+                            onReady: onReady,
+                            onChange: onChange
+                        });
                     });
                 }
 
diff --git a/awx/ui/client/src/license/license.controller.js b/awx/ui/client/src/license/license.controller.js
index 6fb1c84d48..b385020d6d 100644
--- a/awx/ui/client/src/license/license.controller.js
+++ b/awx/ui/client/src/license/license.controller.js
@@ -7,9 +7,10 @@
 export default
     ['Wait', '$state', '$scope', '$rootScope', '$location', 'GetBasePath',
     'Rest', 'ProcessErrors', 'CheckLicense', 'moment','$window',
-    'ConfigService',
+    'ConfigService', 'FeaturesService', 'pendoService',
     function( Wait, $state, $scope, $rootScope, $location, GetBasePath, Rest,
-        ProcessErrors, CheckLicense, moment, $window, ConfigService){
+        ProcessErrors, CheckLicense, moment, $window, ConfigService,
+        FeaturesService, pendoService){
         $scope.getKey = function(event){
             // Mimic HTML5 spec, show filename
             $scope.fileName = event.target.files[0].name;
@@ -47,15 +48,18 @@ export default
 			CheckLicense.post($scope.newLicense.file, $scope.newLicense.eula)
 				.success(function(){
 					reset();
-					init();
                     ConfigService.delete();
                     ConfigService.getConfig().then(function(){
+                        delete($rootScope.features);
+                        FeaturesService.get();
+                        pendoService.issuePendoIdentity();
                         if($rootScope.licenseMissing === true){
-    						$state.go('dashboard', {
+                            $state.go('dashboard', {
     							licenseMissing: false
     						});
     					}
     					else{
+                            init();
     						$scope.success = true;
     						$rootScope.licenseMissing = false;
     						// for animation purposes
@@ -65,7 +69,6 @@ export default
     						}, 4000);
     					}
                     });
-
 			});
 		};
 	 	var calcDaysRemaining = function(seconds){
diff --git a/awx/ui/client/src/login/loginModal/loginModal.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js
index c2793c5223..3122e5fcb6 100644
--- a/awx/ui/client/src/login/loginModal/loginModal.controller.js
+++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js
@@ -57,9 +57,10 @@
 export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope',
     '$location', 'Authorization', 'ToggleClass', 'Alert', 'Wait', 'Timer',
     'Empty', 'ClearScope', '$scope', 'pendoService', 'ConfigService',
+    'CheckLicense', 'FeaturesService',
     function ($log, $cookieStore, $compile, $window, $rootScope, $location,
         Authorization, ToggleClass, Alert, Wait, Timer, Empty, ClearScope,
-        scope, pendoService, ConfigService) {
+        scope, pendoService, ConfigService, CheckLicense, FeaturesService) {
 
     var lastPath, lastUser, sessionExpired, loginAgain;
 
@@ -116,7 +117,9 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope',
         //     .success(function (data) {
         //         Authorization.setLicense(data);
         ConfigService.getConfig().then(function(){
+                CheckLicense.test();
                 pendoService.issuePendoIdentity();
+                FeaturesService.get();
                 Wait("stop");
                 if (lastPath() && lastUser()) {
                     // Go back to most recent navigation path
diff --git a/awx/ui/client/src/rest/interceptors.service.js b/awx/ui/client/src/rest/interceptors.service.js
index 2ace57abee..1fef3584f2 100644
--- a/awx/ui/client/src/rest/interceptors.service.js
+++ b/awx/ui/client/src/rest/interceptors.service.js
@@ -16,7 +16,9 @@
             return {
                 response: function(config) {
                     if(config.headers('auth-token-timeout') !== null){
-                        $AnsibleConfig.session_timeout = Number(config.headers('auth-token-timeout'));
+                        $rootScope.loginConfig.promise.then(function () {
+                            $AnsibleConfig.session_timeout = Number(config.headers('auth-token-timeout'));
+                        });
                     }
                     return config;
                 },
diff --git a/awx/ui/client/src/shared/config/config.service.js b/awx/ui/client/src/shared/config/config.service.js
index 13ca1ebb8a..95d1a0f86a 100644
--- a/awx/ui/client/src/shared/config/config.service.js
+++ b/awx/ui/client/src/shared/config/config.service.js
@@ -6,8 +6,8 @@
 
 
 export default
-   ['GetBasePath', 'ProcessErrors', '$q', 'Rest', '$rootScope', '$state',
-   function (GetBasePath, ProcessErrors, $q, Rest, $rootScope, $state) {
+   ['GetBasePath', 'ProcessErrors', '$q', 'Rest', '$rootScope',
+   function (GetBasePath, ProcessErrors, $q, Rest, $rootScope) {
        return {
             get: function(){
                 return this.config;
diff --git a/awx/ui/client/src/shared/features/features.service.js b/awx/ui/client/src/shared/features/features.service.js
index 16ad2e7130..9d4df28281 100644
--- a/awx/ui/client/src/shared/features/features.service.js
+++ b/awx/ui/client/src/shared/features/features.service.js
@@ -16,10 +16,14 @@ function ($rootScope, Rest, GetBasePath, ProcessErrors, $http, $q,
                 if(config){
                     license_info = config.license_info;
                     $rootScope.features = config.license_info.features;
+                    $rootScope.$emit('featuresLoaded');
                     return $rootScope.features;
                 }
-                return {};
+                else {
+                    return {};
+                }
             },
+
             get: function(){
                 if(_.isEmpty($rootScope.features)){
                     return this.getFeatures();
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 3ef22859b4..73032b281f 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -1702,6 +1702,9 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                                 if (button.ngClick) {
                                     html += this.attr(button, 'ngClick');
                                 }
+                                if (button.awFeature) {
+                                    html += this.attr(button, 'awFeature');
+                                }
                                 if (button.ngDisabled) {
                                     ngDisabled = (button.ngDisabled===true) ? this.form.name+"_form.$invalid" : button.ngDisabled;
                                     if (btn !== 'reset') {