diff --git a/js/controller/CardController.js b/js/controller/CardController.js
index 46dcf4e07..fc4741e2b 100644
--- a/js/controller/CardController.js
+++ b/js/controller/CardController.js
@@ -23,7 +23,7 @@
 /* global app */
 /* global moment */
 
-app.controller('CardController', function ($scope, $rootScope, $routeParams, $location, $stateParams, $interval, BoardService, CardService, StackService, StatusService) {
+app.controller('CardController', function ($scope, $rootScope, $routeParams, $location, $stateParams, $interval, $timeout, BoardService, CardService, StackService, StatusService) {
 	$scope.sidebar = $rootScope.sidebar;
 	$scope.status = {
 		lastEdit: 0,
@@ -139,4 +139,34 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo
 		CardService.update(element);
 		StackService.updateCard(element);
 	};
+
+	/**
+	 * Assigning users to cards
+	 */
+
+	/**
+	 * Show ui-select field when clicking the add button
+	 */
+	$scope.showAssignUser = function() {
+		$scope.status.showAssignUser = true;
+		$timeout(function() {
+			$("#assignUserSelect").find('a')[0].click();
+		});
+	};
+
+	$scope.assingUserOpenClose = function(isOpen) {
+		if (!isOpen) {
+			$scope.status.showAssignUser = false;
+		}
+	};
+
+	$scope.addAssignedUser = function(item) {
+		$scope.status.showAssignUser = false;
+		$('assignUserSelect').hide();
+		console.log(a);
+	};
+
+	$scope.removeAssignedUser = function() {
+
+	};
 });
diff --git a/js/service/CardService.js b/js/service/CardService.js
index 7de28a7a1..e86815021 100644
--- a/js/service/CardService.js
+++ b/js/service/CardService.js
@@ -93,9 +93,31 @@ app.factory('CardService', function(ApiService, $http, $q){
             deferred.reject('Error while update ' + self.endpoint);
         });
         return deferred.promise;
-
     };
 
+	CardService.prototype.assignUser = function (card, user) {
+		var deferred = $q.defer();
+		var self = this;
+		$http.post(this.baseUrl + '/' + card.id + '/assign', {'user': user}).then(function (response) {
+			deferred.resolve(response.data);
+		}, function (error) {
+			deferred.reject('Error while update ' + self.endpoint);
+		});
+		return deferred.promise;
+
+	};
+
+	CardService.prototype.unassignUser = function (card, user) {
+		var deferred = $q.defer();
+		var self = this;
+		$http.delete(this.baseUrl + '/' + card.id + '/assign', {'user': user}).then(function (response) {
+			deferred.resolve(response.data);
+		}, function (error) {
+			deferred.reject('Error while update ' + self.endpoint);
+		});
+		return deferred.promise;
+	};
+
     service = new CardService($http, 'cards', $q);
     return service;
 });
\ No newline at end of file
diff --git a/templates/part.board.sidebarView.php b/templates/part.board.sidebarView.php
index a1490f62d..d9f63237a 100644
--- a/templates/part.board.sidebarView.php
+++ b/templates/part.board.sidebarView.php
@@ -18,7 +18,9 @@
 <div class="tabsContainer">
     <div id="commentsTabView" class="tab commentsTabView" ng-if="status.boardtab==0 || !status.boardtab">
 
-        <ui-select ng-if="boardservice.canShare()" ng-model="status.addSharee" theme="select2" style="width:100%;" title="Choose a user to assign" placeholder="Assign users ..." on-select="aclAdd(status.addSharee)" search-enabled="true">
+        <ui-select ng-if="boardservice.canShare()" ng-model="status.addSharee" theme="select2" style="width:100%;"
+				   title="Choose a user to assign" placeholder="Assign users ..."
+				   on-select="aclAdd(status.addSharee)" search-enabled="true">
             <ui-select-match placeholder="<?php p($l->t('Select users or groups to share with')); ?>">
                 <span><i class="icon icon-{{$item.type}}"></i> {{ $item.participant.displayname }}</span>
             </ui-select-match>
diff --git a/templates/part.card.php b/templates/part.card.php
index 14e5b1fd4..4265cf34e 100644
--- a/templates/part.card.php
+++ b/templates/part.card.php
@@ -51,18 +51,17 @@
 	</div>
 	<div class="section-header">
 		<h4><?php p($l->t('Assign users')); ?></h4>
-		<button class="button icon-add"></button>
+		<button class="button icon-add" ng-click="showAssignUser()"></button>
 	</div>
-	<ui-select ng-model="status.addSharee" theme="select2" style="width:100%;" title="Choose a user to assign" placeholder="Assign users ..." on-select="aclAdd(status.addSharee)" search-enabled="true">
+	<ui-select id="assignUserSelect" theme="select2" style="width:100%;"
+			   title="Choose a user to assign" placeholder="Choose a user to assign"
+			   on-select="addAssignedUser($item)" search-enabled="true" ng-show="status.showAssignUser" uis-open-close="assingUserOpenClose(isOpen)">
 		<ui-select-match placeholder="<?php p($l->t('Assign this card to a user')); ?>">
 			<span><i class="icon icon-{{$item.type}}"></i> {{ $item.participant.displayname }}</span>
 		</ui-select-match>
-		<ui-select-choices refresh="searchForUser($select.search)" refresh-delay="0" repeat="sharee in boardservice.sharees">
-			<span><i class="icon icon-{{sharee.type}}"></i> {{ sharee.participant.displayname }}</span>
+		<ui-select-choices refresh="searchUsers($select.search)" refresh-delay="0" repeat="user in boardservice.getCurrent().users">
+			<div class="avatardiv" avatar ng-attr-displayname="{{ user.uid }}" ng-if="boardservice.id"></div><span>{{ user.displayname }}</span>
 		</ui-select-choices>
-		<ui-select-no-choice>
-			<?php p($l->t('No matching user or group found.')); ?>
-		</ui-select-no-choice>
 	</ui-select>
 	<div class="avatardiv" avatar ng-attr-displayname="{{ boardservice.getCurrent().owner.uid }}" ng-if="boardservice.id"></div>