diff --git a/core/js/share.js b/core/js/share.js
index 877ef4856a33f987e55037b779c20c1e0ffccd1c..b3533af4824f8be2623e39ae71f11a15cf1df295 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -203,6 +203,9 @@ OC.Share={
 			tooltip += '@' + userDomain;
 		}
 		if (server) {
+			if (!userDomain) {
+				userDomain = '…';
+			}
 			tooltip += '@' + server;
 		}
 
diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js
index f45008954648d8f0646863edd99cfe69e0ff3b2e..7eb22261e1034ca44b7ade4a1302a6e174166d4b 100644
--- a/core/js/tests/specs/shareSpec.js
+++ b/core/js/tests/specs/shareSpec.js
@@ -702,17 +702,17 @@ describe('OC.Share tests', function() {
 			it('displays the user name part of a remote share owner', function() {
 				checkOwner(
 					'User One@someserver.com',
-					'User One',
+					'User One@…',
 					'User One@someserver.com'
 				);
 				checkOwner(
 					'User One@someserver.com/',
-					'User One',
+					'User One@…',
 					'User One@someserver.com'
 				);
 				checkOwner(
 					'User One@someserver.com/root/of/owncloud',
-					'User One',
+					'User One@…',
 					'User One@someserver.com'
 				);
 			});