diff --git a/js/controller/BoardController.js b/js/controller/BoardController.js
index 6273875cb..65b4f9e68 100644
--- a/js/controller/BoardController.js
+++ b/js/controller/BoardController.js
@@ -347,15 +347,19 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 			$scope.status.createLabel = false;
 			$scope.newLabel = {};
 		}).catch(err => {
-			OC.Notification.showTemporary('Duplicate label name is not allowed');
+			OC.Notification.showTemporary(err);
 		});
 	};
 
+	$scope.labelUpdateBefore = function (label) {
+		label.renameTitle = label.title;
+	};
+
 	$scope.labelUpdate = function (label) {
 		label.edit = false;
 		LabelService.update(label).catch(err => {
-			label.title('XXX');
-			OC.Notification.showTemporary('Duplicate label name is not allowed');
+			label.title = label.renameTitle;
+			OC.Notification.showTemporary(err);
 		});
 
 		// update labels in UI
diff --git a/js/service/ApiService.js b/js/service/ApiService.js
index 077ed4dd7..d5599e69a 100644
--- a/js/service/ApiService.js
+++ b/js/service/ApiService.js
@@ -119,7 +119,7 @@ app.factory('ApiService', function ($http, $q) {
 			self.add(response.data);
 			deferred.resolve(response.data);
 		}, function (error) {
-			deferred.reject('Fetching' + self.endpoint + ' failed');
+			deferred.reject(error.data.message);
 		});
 		return deferred.promise;
 	};
@@ -131,7 +131,7 @@ app.factory('ApiService', function ($http, $q) {
 			self.add(response.data);
 			deferred.resolve(response.data);
 		}, function (error) {
-			deferred.reject('Updating ' + self.endpoint + ' failed');
+			deferred.reject(error.data.message);
 		});
 		return deferred.promise;
 
diff --git a/lib/Service/LabelService.php b/lib/Service/LabelService.php
index 8bc041ca5..a3a9639b9 100644
--- a/lib/Service/LabelService.php
+++ b/lib/Service/LabelService.php
@@ -153,7 +153,7 @@ class LabelService {
 			throw new BadRequestException('label id must be a number');
 		}
 
-		if ($title === false || $title === null) {
+		if ($title === false || $title === null || $title === "") {
 			throw new BadRequestException('title must be provided');
 		}
 
diff --git a/templates/part.board.sidebarView.php b/templates/part.board.sidebarView.php
index db35568be..928510b01 100644
--- a/templates/part.board.sidebarView.php
+++ b/templates/part.board.sidebarView.php
@@ -105,7 +105,7 @@
                         </div>
                     </div>
                     <a ng-if="boardservice.canManage() && label.edit" ng-click="labelUpdate(label)" class="icon" title="<?php p($l->t('Update tag')); ?>"><i class="icon icon-checkmark" ></i><span class="hidden-visually"><?php p($l->t('Update tag')); ?></span></a>
-                    <a ng-if="boardservice.canManage() && !label.edit" ng-click="label.edit=true" class="icon" title="<?php p($l->t('Edit tag')); ?>"><i class="icon icon-rename"></i><span class="hidden-visually"><?php p($l->t('Edit tag')); ?></span></a>
+                    <a ng-if="boardservice.canManage() && !label.edit" ng-click="labelUpdateBefore(label); label.edit=true" class="icon" title="<?php p($l->t('Edit tag')); ?>"><i class="icon icon-rename"></i><span class="hidden-visually"><?php p($l->t('Edit tag')); ?></span></a>
                     <a ng-if="boardservice.canManage()" ng-click="labelDelete(label)" class="icon" title="<?php p($l->t('Delete tag')); ?>"><i class="icon icon-delete" ></i><span class="hidden-visually"><?php p($l->t('Delete tag')); ?></span></a>
                 </li>
                 <li ng-if="status.createLabel">