diff --git a/src/views/branding.html b/src/views/branding.html
index 2a829b051..7470d2182 100644
--- a/src/views/branding.html
+++ b/src/views/branding.html
@@ -40,7 +40,7 @@
             <div class="form-group" ng-class="{ 'has-error': (aboutForm.name.$dirty && aboutForm.name.$invalid) }">
               <label class="control-label">{{ 'branding.cloudronName' | tr }}</label>
               <div class="control-label" ng-show="about.error.cloudronName">{{about.error.cloudronName}}</div>
-              <input type="text" class="form-control" id="inputCloudronName" name="name" ng-model="about.cloudronName">
+              <input type="text" class="form-control" id="inputCloudronName" name="name" ng-model="about.cloudronName" maxlength="64">
             </div>
 
             <div class="form-group">
diff --git a/src/views/branding.js b/src/views/branding.js
index 745417b6d..2e81d755e 100644
--- a/src/views/branding.js
+++ b/src/views/branding.js
@@ -165,8 +165,7 @@ angular.module('Application').controller('BrandingController', ['$scope', '$loca
                 if (error) {
                     $scope.about.busy = false;
                     if (error.statusCode === 400) {
-                        $scope.about.error.cloudronName = 'Invalid name';
-                        $scope.about.cloudronName = '';
+                        $scope.about.error.cloudronName = error.message || 'Invalid name';
                         $('#inputCloudronName').focus();
                     } else {
                         console.error('Unable to change name.', error);