diff --git a/ownCloudAppShared/Client/Collection Views/Cells/UniversalItemListCell Content Providers/OCShare+UniversalItemListCellContentProvider.swift b/ownCloudAppShared/Client/Collection Views/Cells/UniversalItemListCell Content Providers/OCShare+UniversalItemListCellContentProvider.swift
index 1419795e8..5f7b7d246 100644
--- a/ownCloudAppShared/Client/Collection Views/Cells/UniversalItemListCell Content Providers/OCShare+UniversalItemListCellContentProvider.swift	
+++ b/ownCloudAppShared/Client/Collection Views/Cells/UniversalItemListCell Content Providers/OCShare+UniversalItemListCellContentProvider.swift	
@@ -88,7 +88,7 @@ extension OCShare: UniversalItemListCellContentProvider {
 						}
 					} else {
 						// Link shares
-						content.title = .text(name ?? "Link".localized)
+						content.title = .text(name ?? token ??  "Link".localized)
 
 						if let urlString = url?.absoluteString, urlString.count > 0 {
 							if let roleName = matchingRole?.localizedName {
diff --git a/ownCloudAppShared/Client/Sharing/ShareViewController.swift b/ownCloudAppShared/Client/Sharing/ShareViewController.swift
index 2c8950fe4..0eba7c02d 100644
--- a/ownCloudAppShared/Client/Sharing/ShareViewController.swift
+++ b/ownCloudAppShared/Client/Sharing/ShareViewController.swift
@@ -183,8 +183,8 @@ open class ShareViewController: CollectionViewController, SearchViewControllerDe
 			let textField : UITextField = ThemeCSSTextField()
 			textField.translatesAutoresizingMaskIntoConstraints = false
 			textField.setContentHuggingPriority(.required, for: .vertical)
-			textField.setContentCompressionResistancePriority(.required, for: .horizontal)
-			textField.placeholder = "Link".localized
+			textField.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+			textField.placeholder = share?.token ?? "Link".localized
 			textField.text = share?.name
 			textField.accessibilityLabel = "Name".localized