diff --git a/src/views/profile.js b/src/views/profile.js
index c174bd1fe..e532cdacb 100644
--- a/src/views/profile.js
+++ b/src/views/profile.js
@@ -363,11 +363,12 @@ angular.module('Application').controller('ProfileController', ['$scope', '$locat
 
         submit: function () {
             $scope.appPasswordAdd.busy = true;
-            $scope.appPasswordAdd.password = {};
 
             Client.addAppPassword($scope.appPasswordAdd.identifier, $scope.appPasswordAdd.name, function (error, result) {
+                $scope.appPasswordAdd.busy = false;
+
                 if (error) {
-                    if (error.statusCode === 400) {
+                    if (error.statusCode === 400 || error.statusCode === 409) {
                         $scope.appPasswordAdd.error.name = error.message;
                         $scope.appPasswordAddForm.name.$setPristine();
                         $('#inputAppPasswordName').focus();
@@ -377,7 +378,6 @@ angular.module('Application').controller('ProfileController', ['$scope', '$locat
                     return;
                 }
 
-                $scope.appPasswordAdd.busy = false;
                 $scope.appPasswordAdd.password = result;
 
                 $scope.appPassword.refresh();