diff --git a/src/index.html b/src/index.html
index 3afd772a7..d28433a04 100644
--- a/src/index.html
+++ b/src/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
 
     <!-- this gets changed once we get the config (because angular has not loaded yet, we see template string for a flash) -->
-    <title> Cloudron </title>
+    <title>&lrm;</title>
 
     <link id="favicon" type="image/png" rel="icon" href="/api/v1/cloudron/avatar">
     <link rel="apple-touch-icon" href="/api/v1/cloudron/avatar">
diff --git a/src/js/login.js b/src/js/login.js
index 258957d79..c133a6c85 100644
--- a/src/js/login.js
+++ b/src/js/login.js
@@ -120,7 +120,7 @@ app.controller('LoginController', ['$scope', '$http', function ($scope, $http) {
     };
 
     $scope.showLogin = function () {
-        window.document.title = 'Cloudron Login';
+        if ($scope.status) window.document.title = $scope.status.cloudronName + ' Login';
         $scope.mode = 'login';
         $scope.error = false;
         setTimeout(function () { $('#inputUsername').focus(); }, 200);
@@ -137,6 +137,7 @@ app.controller('LoginController', ['$scope', '$http', function ($scope, $http) {
 
         if (status !== 200) return;
 
+        if ($scope.mode === 'login') window.document.title = data.cloudronName + ' Login';
         $scope.status = data;
     }).error(function () {
         $scope.initialized = false;
diff --git a/src/login.html b/src/login.html
index 951543c01..1913eadfa 100644
--- a/src/login.html
+++ b/src/login.html
@@ -5,7 +5,8 @@
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
     <meta http-equiv="Content-Security-Policy" content="default-src <%= apiOrigin %> 'unsafe-inline' 'unsafe-eval' 'self'; img-src <%= apiOrigin %> 'self'" />
 
-    <title>Cloudron Login</title>
+    <!-- this gets changed once we get the status (because angular has not loaded yet, we see template string for a flash) -->
+    <title>&lrm;</title>
 
     <link id="favicon" href="<%= apiOrigin %>/api/v1/cloudron/avatar" rel="icon" type="image/png">
 
diff --git a/src/logs.html b/src/logs.html
index 4c18c020a..63af169e6 100644
--- a/src/logs.html
+++ b/src/logs.html
@@ -4,7 +4,6 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
 
-    <!-- this gets changed once we get the config (because angular has not loaded yet, we see template string for a flash) -->
     <title> Logs </title>
 
     <link id="favicon" href="/api/v1/cloudron/avatar" rel="icon" type="image/png">
diff --git a/src/terminal.html b/src/terminal.html
index 0dc3fc56c..71ca765bf 100644
--- a/src/terminal.html
+++ b/src/terminal.html
@@ -4,7 +4,6 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
 
-    <!-- this gets changed once we get the config (because angular has not loaded yet, we see template string for a flash) -->
     <title> Terminal </title>
 
     <link id="favicon" href="/api/v1/cloudron/avatar" rel="icon" type="image/png">