diff --git a/static/js/directives/ui/convert-user-to-org.js b/static/js/directives/ui/convert-user-to-org.js
index dc2b16c72..47bdd4e0f 100644
--- a/static/js/directives/ui/convert-user-to-org.js
+++ b/static/js/directives/ui/convert-user-to-org.js
@@ -39,6 +39,10 @@ angular.module('quay').directive('convertUserToOrg', function () {
 
         $scope.loading = true;
 
+        var errorHandler = ApiService.errorDisplay(function() {
+          $scope.loading = false;
+        });
+
         var data = {
           'adminUser': $scope.org.adminUser,
           'adminPassword': $scope.org.adminPassword,
@@ -49,14 +53,7 @@ angular.module('quay').directive('convertUserToOrg', function () {
           CookieService.putPermanent('quay.namespace', $scope.user.username);
           UserService.load();
           $location.path('/');
-        }, function(resp) {
-          $scope.loading = false;
-          if (resp.data.reason == 'invaliduser') {
-            $('#invalidadminModal').modal({});
-          } else {
-            $('#cannotconvertModal').modal({});
-          }
-        });
+        }, errorHandler);
       };
     }
   };