diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html
index c7093ba63..60bb55774 100644
--- a/webadmin/src/views/settings.html
+++ b/webadmin/src/views/settings.html
@@ -90,25 +90,29 @@
                 <h4 class="modal-title">Login to the Cloudron Store</h4>
             </div>
             <div class="modal-body">
+                <center>
+                    <img src="https://cloudron.io/img/logo.png" width="128px" height="128px"/>
+                </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) }">
                         <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)">
                             <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>
-                        <input type="email" class="form-control" ng-model="appstoreLogin.email" name="email" required autofocus>
                     </div>
 
                     <div class="form-group" ng-class="{ 'has-error': (!appstoreLoginForm.password.$dirty && appstoreLogin.error.password) || (appstoreLoginForm.password.$dirty && appstoreLoginForm.password.$invalid) }">
                         <label class="control-label">Password</label>
+                        <input type="password" class="form-control" ng-model="appstoreLogin.password" id="inputPlanChangePassword" name="password" required autofocus>
                         <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>
                         </div>
-                        <input type="password" class="form-control" ng-model="appstoreLogin.password" id="inputPlanChangePassword" name="password" required autofocus>
                     </div>
 
                     <input class="ng-hide" type="submit" ng-disabled="appstoreLoginForm.$invalid"/>