diff --git a/webadmin/src/js/client.js b/webadmin/src/js/client.js
index 8993eca6f..da04601eb 100644
--- a/webadmin/src/js/client.js
+++ b/webadmin/src/js/client.js
@@ -429,7 +429,7 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
         var data = config;
 
         post('/api/v1/settings/appstore_config', data).success(function(data, status) {
-            if (status !== 200) return callback(new ClientError(status, data));
+            if (status !== 202) return callback(new ClientError(status, data));
             callback(null);
         }).error(defaultErrorHandler(callback));
     };
diff --git a/webadmin/src/views/appstore.html b/webadmin/src/views/appstore.html
index 8954ecdfb..3dbe8d997 100644
--- a/webadmin/src/views/appstore.html
+++ b/webadmin/src/views/appstore.html
@@ -171,23 +171,24 @@
                     <br/><br/>
                     <p>For using the Cloudron App Store, you have to login with your <a href="{{ config.webServerOrigin }}" target="_blank">cloudron.io</a> account.</p>
                     <br/>
+                    <small class="text-danger" ng-show="appstoreLogin.error.generic">{{ appstoreLogin.error.generic }}</small>
                 </center>
 
                 <form name="appstoreLoginForm" role="form" novalidate ng-submit="appstoreLogin.submit()" autocomplete="off">
                     <input type="password" style="display: none;">
 
-                    <div class="form-group" ng-class="{ 'has-error': (appstoreLoginForm.email.$dirty && appstoreLoginForm.email.$invalid) }">
+                    <div class="form-group" ng-class="{ 'has-error': (appstoreLoginForm.email.$dirty && appstoreLoginForm.email.$invalid) || appstoreLogin.error.generic }">
                         <label class="control-label">Email Address</label>
-                        <input type="email" class="form-control" ng-model="appstoreLogin.email" name="email" required autofocus>
-                        <div class="control-label" ng-show="(!appstoreLoginForm.email.$dirty && appstoreLogin.error.email) || (appstoreLoginForm.email.$dirty && appstoreLoginForm.email.$invalid)">
+                        <input type="email" class="form-control" ng-model="appstoreLogin.email" id="inputAppstoreLoginEmail" name="email" required autofocus>
+                        <div class="control-label" ng-show="(!appstoreLoginForm.email.$dirty && appstoreLogin.error.email) || (appstoreLoginForm.email.$dirty && appstoreLoginForm.email.$invalid) || appstoreLogin.error.email">
                             <small ng-show="appstoreLoginForm.email.$error.required">A valid email address is required</small>
                             <small ng-show="(appstoreLoginForm.email.$dirty && appstoreLoginForm.email.$invalid) && !appstoreLoginForm.email.$error.required">The Email address is not valid</small>
                         </div>
                     </div>
 
-                    <div class="form-group" ng-class="{ 'has-error': (!appstoreLoginForm.password.$dirty && appstoreLogin.error.password) || (appstoreLoginForm.password.$dirty && appstoreLoginForm.password.$invalid) }">
+                    <div class="form-group" ng-class="{ 'has-error': (!appstoreLoginForm.password.$dirty && appstoreLogin.error.password) || (appstoreLoginForm.password.$dirty && appstoreLoginForm.password.$invalid) || appstoreLogin.error.generic }">
                         <label class="control-label">Password</label>
-                        <input type="password" class="form-control" ng-model="appstoreLogin.password" id="inputAppstoreLoginPassword" name="password" required autofocus>
+                        <input type="password" class="form-control" ng-model="appstoreLogin.password" id="inputAppstoreLoginPassword" name="password" required>
                         <div class="control-label" ng-show="(!appstoreLoginForm.password.$dirty && appstoreLogin.error.password) || (appstoreLoginForm.password.$dirty && appstoreLoginForm.password.$invalid)">
                             <small ng-show=" appstoreLoginForm.password.$dirty && appstoreLoginForm.password.$invalid">A password is required</small>
                             <small ng-show="!appstoreLoginForm.password.$dirty && appstoreLogin.error.password">Wrong password</small>
diff --git a/webadmin/src/views/appstore.js b/webadmin/src/views/appstore.js
index 27f7baf4e..4e1793c27 100644
--- a/webadmin/src/views/appstore.js
+++ b/webadmin/src/views/appstore.js
@@ -241,7 +241,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
             $scope.appstoreLogin.busy = true;
 
             AppStore.login($scope.appstoreLogin.email, $scope.appstoreLogin.password, function (error, result) {
-
                 if (error) {
                     $scope.appstoreLogin.busy = false;
 
@@ -263,7 +262,27 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
                 };
 
                 Client.setAppstoreConfig(config, function (error) {
-                    if (error) return console.error(error);
+                    if (error) {
+                        $scope.appstoreLogin.busy = false;
+
+                        if (error.statusCode === 406) {
+                            if (error.message === 'wrong user') {
+                                $scope.appstoreLogin.error.generic = 'Wrong cloudron.io account';
+                                $scope.appstoreLogin.email = '';
+                                $scope.appstoreLogin.password = '';
+                                $scope.appstoreLoginForm.email.$setPristine();
+                                $scope.appstoreLoginForm.password.$setPristine();
+                                $('#inputAppstoreLoginEmail').focus();
+                            } else {
+                                console.error(error);
+                                $scope.appstoreLogin.error.generic = 'Please retry later';
+                            }
+                        } else {
+                            console.error(error);
+                        }
+
+                        return;
+                    }
 
                     $scope.appstoreLogin.reset();
                     $('#appstoreLoginModal').modal('hide');