diff --git a/static/directives/create-robot-dialog.html b/static/directives/create-robot-dialog.html
index c631f7880..9f8db12c1 100644
--- a/static/directives/create-robot-dialog.html
+++ b/static/directives/create-robot-dialog.html
@@ -1,7 +1,7 @@
 <div class="create-robot-dialog-element">
   <div ng-if="info">
     <div class="create-entity-dialog" info="info" entity-title="robot account"
-         entity-kind="user"
+         entity-kind="robot"
          entity-icon="ci-robot" entity-name-regex="{{ ROBOT_PATTERN }}"
          entity-create-requested="createRobot(name, callback)"
          entity-create-completed="robotFinished(entity)"></div>
diff --git a/static/js/core-ui.js b/static/js/core-ui.js
index f7457ce0a..a1395bf1f 100644
--- a/static/js/core-ui.js
+++ b/static/js/core-ui.js
@@ -676,13 +676,17 @@ angular.module("core-ui", [])
 
         $scope.toggleItems = function($event) {
           $event.stopPropagation();
-          $scope.controller.toggleItems();
+          if ($scope.controller) {
+            $scope.controller.toggleItems();
+          }
         };
 
         this.checkByFilter = function(filter) {
-          $scope.controller.checkByFilter(function(item) {
-            return filter({'item': item});
-          });
+          if ($scope.controller) {
+            $scope.controller.checkByFilter(function(item) {
+              return filter({'item': item});
+            });
+          }
         };
       }
     };