diff --git a/ios-sdk b/ios-sdk
index 1bf0da8df..b299cd80d 160000
--- a/ios-sdk
+++ b/ios-sdk
@@ -1 +1 @@
-Subproject commit 1bf0da8df79f2a7fe72c4852c2d9563406f24026
+Subproject commit b299cd80deefcd886069ea4fa9a49c82d586f193
diff --git a/ownCloudAppShared/Client/Sharing/ShareViewController.swift b/ownCloudAppShared/Client/Sharing/ShareViewController.swift
index f663a80fb..b1e6a5609 100644
--- a/ownCloudAppShared/Client/Sharing/ShareViewController.swift
+++ b/ownCloudAppShared/Client/Sharing/ShareViewController.swift
@@ -610,17 +610,33 @@ open class ShareViewController: CollectionViewController, SearchViewControllerDe
 			   permissions?.contains(.delete) == true && (
 				permissions?.contains(.create) == true ||
 				permissions?.contains(.update) == true) {
+				// Read/Write/Delete
+				if mode == .edit {
+					return capabilities.publicSharingPasswordBlockRemovalForReadWriteDelete == true
+				}
 				return capabilities.publicSharingPasswordEnforcedForReadWriteDelete == true
 			}
 			if permissions?.contains(.read) == true && (
 				permissions?.contains(.create) == true ||
 				permissions?.contains(.update) == true) {
+				// Read/Write
+				if mode == .edit {
+					return capabilities.publicSharingPasswordBlockRemovalForReadWrite == true
+				}
 				return capabilities.publicSharingPasswordEnforcedForReadWrite == true
 			}
 			if permissions?.contains(.create) == true {
+				// Upload only
+				if mode == .edit {
+					return capabilities.publicSharingPasswordBlockRemovalForUploadOnly == true
+				}
 				return capabilities.publicSharingPasswordEnforcedForUploadOnly == true
 			}
 			if permissions?.contains(.read) == true {
+				// Read only
+				if mode == .edit {
+					return capabilities.publicSharingPasswordBlockRemovalForReadOnly == true
+				}
 				return capabilities.publicSharingPasswordEnforcedForReadOnly == true
 			}
 		}