diff --git a/frontend/app/scripts/app.js b/frontend/app/scripts/app.js
index e97d50330e..c6d678cfb2 100644
--- a/frontend/app/scripts/app.js
+++ b/frontend/app/scripts/app.js
@@ -250,7 +250,24 @@ angular.module('thehive', [
                 controller: 'AdminAnalyzerTemplatesCtrl',
                 controllerAs: 'vm',
                 title: 'Analyzer templates administration',
-                permissions: ['manageAnalyzerTemplate']
+                permissions: ['manageAnalyzerTemplate'],
+                resolve: {
+                    appConfig: function($q, VersionSrv) {
+                        var defer = $q.defer();
+
+                        VersionSrv.get()
+                            .then(function(config) {
+                                // Check if Cortex is enabled
+                                if(VersionSrv.hasCortexConnector()) {
+                                    defer.resolve(config);
+                                } else {
+                                    defer.reject();
+                                }
+                            });
+
+                        return defer.promise;
+                    },
+                }
             })
             .state('app.administration.custom-fields', {
                 url: '/custom-fields',
diff --git a/frontend/app/scripts/controllers/RootCtrl.js b/frontend/app/scripts/controllers/RootCtrl.js
index b64db354c6..d69ecf94a2 100644
--- a/frontend/app/scripts/controllers/RootCtrl.js
+++ b/frontend/app/scripts/controllers/RootCtrl.js
@@ -15,6 +15,7 @@ angular.module('theHiveControllers').controller('RootCtrl',
 
         $rootScope.layoutSrv = AppLayoutSrv;
         $scope.appConfig = appConfig;
+        $scope.hasCortexConnector = VersionSrv.hasCortexConnector();
 
         $scope.querystring = '';
         $scope.view = {
@@ -46,6 +47,7 @@ angular.module('theHiveControllers').controller('RootCtrl',
           });
 
           $scope.appConfig = conf;
+          $scope.hasCortexConnector = VersionSrv.hasCortexConnector();
         });
 
         CaseTemplateSrv.list().then(function(templates) {
diff --git a/frontend/app/scripts/services/api/VersionSrv.js b/frontend/app/scripts/services/api/VersionSrv.js
index 9750314fc0..a303256013 100644
--- a/frontend/app/scripts/services/api/VersionSrv.js
+++ b/frontend/app/scripts/services/api/VersionSrv.js
@@ -32,6 +32,16 @@
                     return deferred.promise;
                 },
 
+                hasCortexConnector: function() {
+                    try {
+                        var service = cache.connectors.cortex;
+
+                        return service.enabled;
+                    } catch (err) {
+                        return false;
+                    }
+                },
+
                 hasCortex: function() {
                     try {
                         var service = cache.connectors.cortex;
@@ -52,7 +62,7 @@
 
                     (misp.servers || []).forEach(function(item) {
                         urls[item.name] = item.url;
-                    });                    
+                    });
                     return urls;
                 }
             };
diff --git a/frontend/app/views/components/header.component.html b/frontend/app/views/components/header.component.html
index 1a2ba02a5b..7008041519 100644
--- a/frontend/app/views/components/header.component.html
+++ b/frontend/app/views/components/header.component.html
@@ -24,25 +24,6 @@
                         <span class="hpad5">New Case</span>
                     </a>
                 </li>
-                <!-- <li class="dropdown" uib-dropdown>
-                    <a class="dropdown-toggle" uib-dropdown-toggle href>
-                        <i class="fa fa-plus"></i>
-                        <span class="hpad5">New Case</span>
-                        <span class="caret"></span>
-                    </a>
-                    <ul class="dropdown-menu scroll-dropdown-2x" uib-dropdown-menu>
-                        <li>
-                            <a href ng-click="createNewCase()">Empty Case</a>
-                        </li>
-                        <li class="divider" ng-if="templates && templates.length > 0"></li>
-                        <li ng-repeat="template in templates">
-                            <a href ng-click="createNewCase(template)">{{template.name}}</a>
-                        </li>
-                        <li ng-if="templates && templates.length > 0">
-                            <a href ng-click="openTemplateSelector()">From a template...</a>
-                        </li>
-                    </ul>
-                </li> -->
                 <li ui-sref-active="active">
                     <a ui-sref="app.main({viewId: 'mytasks'})">My tasks
                         <span class="badge alert-danger">{{myCurrentTasks.count}}</span>
@@ -110,12 +91,6 @@
                             </a>
                         </li>
                         <li class="divider"></li>
-                        <!-- <li>
-                            <a ui-sref="app.administration.case-templates">
-                                <i class="fa fa-file-text"></i>
-                                <span class="hpad5">Case templates</span>
-                            </a>
-                        </li> -->
                         <li if-permission="manageCustomField">
                             <a ui-sref="app.administration.custom-fields">
                                 <i class="fa fa-edit"></i>
@@ -128,7 +103,7 @@
                                 <span class="hpad5">Observable types</span>
                             </a>
                         </li>
-                        <li if-permission="manageAnalyzerTemplate">
+                        <li if-permission="manageAnalyzerTemplate" ng-if="hasCortexConnector">
                             <a ui-sref="app.administration.analyzer-templates">
                                 <i class="fa fa-file-text"></i>
                                 <span class="hpad5">Analyzer templates</span>