diff --git a/src/js/login.js b/src/js/login.js
index d536d92f0..305260795 100644
--- a/src/js/login.js
+++ b/src/js/login.js
@@ -13,6 +13,7 @@ app.controller('LoginController', ['$scope', '$http', function ($scope, $http) {
     $scope.mode = '';
     $scope.busy = false;
     $scope.error = false;
+    $scope.cloudronName = 'Cloudron';
     $scope.username = '';
     $scope.password = '';
     $scope.totpToken = '';
@@ -112,6 +113,16 @@ app.controller('LoginController', ['$scope', '$http', function ($scope, $http) {
         setTimeout(function () { $('#inputNewPassword').focus(); }, 200);
     };
 
+    $http.get(API_ORIGIN + '/api/v1/cloudron/status').success(function (data, status) {
+        $scope.initialized = true;
+
+        if (status !== 200) return;
+
+        $scope.cloudronName = data.cloudronName;
+    }).error(function () {
+        $scope.initialized = false;
+    });
+
     // Init into the correct view
     if (search.passwordReset) $scope.showPasswordReset();
     else if (search.resetToken) $scope.showNewPassword();
diff --git a/src/login.html b/src/login.html
index 5dd26db54..9f43e539e 100644
--- a/src/login.html
+++ b/src/login.html
@@ -38,7 +38,7 @@
 
 <body ng-app="Application" ng-controller="LoginController">
 
-<div class="layout-root">
+<div class="layout-root" ng-show="initialized">
 
   <div class="layout-content" ng-show="mode === 'login'">
     <div class="card" style="padding: 20px; margin-top: 100px; max-width: 620px;">
@@ -46,7 +46,7 @@
         <div class="col-md-12" style="text-align: center;">
           <img width="128" height="128" style="margin-top: -84px" src="<%= apiOrigin %>/api/v1/cloudron/avatar"/>
           <br/>
-          <h2>Cloudron Login</h2>
+          <h1><small>Login to</small> {{ cloudronName }}</h1>
         </div>
       </div>
       <br/>
@@ -84,7 +84,7 @@
         <div class="col-md-12" style="text-align: center;">
           <img width="128" height="128" style="margin-top: -84px" src="<%= apiOrigin %>/api/v1/cloudron/avatar"/>
           <br/>
-          <h2>Password Reset</h2>
+          <h2>Password reset</h2>
         </div>
       </div>
       <br/>
@@ -110,7 +110,7 @@
         <div class="col-md-12" style="text-align: center;">
           <img width="128" height="128" style="margin-top: -84px" src="<%= apiOrigin %>/api/v1/cloudron/avatar"/>
           <br/>
-          <h2>Password Reset Email Sent</h2>
+          <h2>Password reset email sent</h2>
           <br/>
           <button class="btn btn-primary" ng-click="showLogin()">Back to login</button>
         </div>
@@ -124,7 +124,7 @@
         <div class="col-md-12" style="text-align: center;">
           <img width="128" height="128" style="margin-top: -84px" src="<%= apiOrigin %>/api/v1/cloudron/avatar"/>
           <br/>
-          <h2>Set New Password</h2>
+          <h2>Set new password</h2>
         </div>
       </div>
       <br/>
