diff --git a/js/directive/avatar.js b/js/directive/avatar.js
index c93165985..6138a1c1f 100644
--- a/js/directive/avatar.js
+++ b/js/directive/avatar.js
@@ -33,7 +33,7 @@ app.directive('avatar', function() {
 			scope.displayname = attr.displayname;
 			var value = attr.user;
 			var avatardiv = $(element).find('.avatardiv');
-			if(typeof attr.contactsmenu !== 'undefined' && attr.contactsmenu !== 'false' && oc_current_user !== value) {
+			if(typeof attr.contactsmenu !== 'undefined' && attr.contactsmenu !== 'false') {
 				avatardiv.contactsMenu(value, 0, $(element));
 				avatardiv.addClass('has-contactsmenu');
 			}
diff --git a/js/directive/contactsmenudelete.js b/js/directive/contactsmenudelete.js
index 8fdbac5ef..b0041b46c 100644
--- a/js/directive/contactsmenudelete.js
+++ b/js/directive/contactsmenudelete.js
@@ -28,6 +28,9 @@ app.directive('contactsmenudelete', function() {
 		link: function(scope, element, attr){
 			var user = attr.user;
 			var menu = $(element).parent().find('.contactsmenu-popover');
+			if (oc_current_user === user) {
+				menu.children(':first').remove();
+			}
 			var menuEntry = $('<li><a><span class="icon icon-delete"></span><span>' + t('deck', 'Remove user from card') + '</span></a></li>');
 			menuEntry.on('click', function () {
 				scope.removeAssignedUser(user);