diff --git a/src/js/setupaccount.js b/src/js/setupaccount.js
index 958a00016..fc47373b3 100644
--- a/src/js/setupaccount.js
+++ b/src/js/setupaccount.js
@@ -11,9 +11,11 @@ app.controller('SetupAccountController', ['$scope', '$http', function ($scope, $
 
     var API_ORIGIN = '<%= apiOrigin %>' || window.location.origin;
 
+    $scope.initialized = false;
     $scope.busy = false;
     $scope.error = null;
     $scope.view = 'setup';
+    $scope.cloudronName = 'Cloudron';
 
     $scope.existingUsername = !!search.username;
     $scope.username = search.username || '';
@@ -69,4 +71,13 @@ app.controller('SetupAccountController', ['$scope', '$http', function ($scope, $
         }).error(error);
     };
 
+    $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;
+    });
 }]);
diff --git a/src/setupaccount.html b/src/setupaccount.html
index d224b0cef..e8d7f91d0 100644
--- a/src/setupaccount.html
+++ b/src/setupaccount.html
@@ -38,7 +38,7 @@
 
 <body ng-app="Application" ng-controller="SetupAccountController">
 
-<div class="layout-root">
+<div class="layout-root" ng-show="initialized">
 
   <div class="layout-content" ng-show="view === 'setup'">
     <div class="card" style="padding: 20px; margin-top: 100px; max-width: 620px;">
@@ -46,8 +46,8 @@
         <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>Welcome</h2>
-          <h3>Before you start, setup your account.</h3>
+          <h1><small>Welcome to</small> {{ cloudronName }}</h1>
+          <h3>Please setup your account</h3>
         </div>
       </div>
       <br/>
