diff --git a/frontend/app/scripts/controllers/RootCtrl.js b/frontend/app/scripts/controllers/RootCtrl.js
index 891c2ead60..b64db354c6 100644
--- a/frontend/app/scripts/controllers/RootCtrl.js
+++ b/frontend/app/scripts/controllers/RootCtrl.js
@@ -160,8 +160,6 @@ angular.module('theHiveControllers').controller('RootCtrl',
                     if(err && !_.isString(err)) {
                         NotificationSrv.error('Switch organisation', err.data, err.status);
                     }
-
-                    NotificationSrv.error('App', err.data, err.status);
                 })
                 .finally(function() {
                     $timeout(function() {
@@ -211,9 +209,15 @@ angular.module('theHiveControllers').controller('RootCtrl',
                 }
             });
 
-            modal.result.then(function(template) {
-                $scope.createNewCase(template);
-            });
+            modal.result
+                .then(function(template) {
+                    $scope.createNewCase(template);
+                })
+                .catch(function(err) {
+                    if(err && !_.isString(err)) {
+                        NotificationSrv.error('Template Selection', err.data, err.status);
+                    }
+                });
         };
 
         $scope.aboutTheHive = function() {
diff --git a/frontend/app/views/components/org/orgSwitch.modal.html b/frontend/app/views/components/org/orgSwitch.modal.html
index 1fb844b48a..dcdec4f1ec 100644
--- a/frontend/app/views/components/org/orgSwitch.modal.html
+++ b/frontend/app/views/components/org/orgSwitch.modal.html
@@ -1,6 +1,6 @@
 <form ng-submit="$modal.confirm()">
     <div class="modal-header bg-primary">
-        <h3 class="modal-title">Switch organisation</h3>
+        <h3 class="modal-title"><i class="fa fa-random"></i> Switch organisation</h3>
     </div>
     <div class="modal-body">
         <p class="mb-xs">