diff --git a/static/directives/delete-ui.html b/static/directives/delete-ui.html
index 275c25b50..88fe0cf92 100644
--- a/static/directives/delete-ui.html
+++ b/static/directives/delete-ui.html
@@ -1,4 +1,4 @@
 <span class="delete-ui-element" ng-click="focus()">
-  <span class="delete-ui-button" ng-click="performDelete()"><button class="btn btn-danger">{{ buttonTitleInternal }}</button></span>
+  <span class="delete-ui-button" ng-click="performDelete()"><button class="btn btn-danger" type="button">{{ buttonTitleInternal }}</button></span>
   <i class="fa fa-times" bs-tooltip="tooltip.title" data-placement="left" data-title="{{ deleteTitle }}"></i>
 </span>
diff --git a/static/js/controllers.js b/static/js/controllers.js
index 822c5a751..0fa731a70 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -1387,14 +1387,16 @@ function RepoAdminCtrl($scope, Restangular, ApiService, KeyService, $routeParams
     });
   };
 
+  $scope.newTokenName = null;
+
   $scope.createToken = function() {
-    var friendlyName = {
-      'friendlyName': $scope.newToken.friendlyName
+    var data = {
+      'friendlyName': $scope.newTokenName
     };
 
     var params = {'repository': namespace + '/' + name};
-    ApiService.createToken(friendlyName, params).then(function(newToken) {
-      $scope.newToken.friendlyName = '';
+    ApiService.createToken(data, params).then(function(newToken) {
+      $scope.newTokenName = null;
       $scope.createTokenForm.$setPristine();
       $scope.tokens[newToken.code] = newToken;
     });
diff --git a/static/partials/repo-admin.html b/static/partials/repo-admin.html
index 441c146bb..2e37e32a3 100644
--- a/static/partials/repo-admin.html
+++ b/static/partials/repo-admin.html
@@ -180,7 +180,7 @@
 
                   <tr>
                     <td class="admin-search">
-                      <input type="text" class="form-control" placeholder="New token description" ng-model="newToken.friendlyName" required>
+                      <input type="text" class="form-control" placeholder="New token description" ng-model="newTokenName" required>
                     </td>
                     <td class="admin-search">
                       <button type="submit" ng-disabled="createTokenForm.$invalid" class="btn btn-sm btn-default">Create</button>