diff --git a/examples/ocmd/ocmd-server-1.toml b/examples/ocmd/ocmd-server-1.toml
index 0f9584cd5b..b8e2b9a968 100644
--- a/examples/ocmd/ocmd-server-1.toml
+++ b/examples/ocmd/ocmd-server-1.toml
@@ -28,9 +28,10 @@ ocmcoresvc = "localhost:19000"
 ocmshareprovidersvc = "localhost:19000"
 ocminvitemanagersvc = "localhost:19000"
 ocmproviderauthorizersvc = "localhost:19000"
-commit_share_to_storage_grant = false
 datagateway = "http://localhost:19001/data"
 transfer_expires = 6 # give it a moment
+commit_share_to_storage_grant = true
+commit_share_to_storage_ref = true
 
 [grpc.services.authregistry]
 driver = "static"
@@ -80,15 +81,9 @@ driver = "memory"
 driver = "static"
 
 [grpc.services.appprovider]
-driver = "wopi"
+driver = "demo"
 app_provider_url = "localhost:19000"
 
-[grpc.services.appprovider.drivers.wopi]
-iop_secret = "hello"
-wopi_url = "http://0.0.0.0:8880/"
-app_name = "Collabora"
-app_url = "https://your-collabora-server.org:9980"
-
 [grpc.services.storageprovider]
 driver = "localhome"
 mount_path = "/home"
diff --git a/examples/ocmd/ocmd-server-2.toml b/examples/ocmd/ocmd-server-2.toml
index 9a945c64e4..86bdbfd593 100644
--- a/examples/ocmd/ocmd-server-2.toml
+++ b/examples/ocmd/ocmd-server-2.toml
@@ -15,9 +15,10 @@ ocmcoresvc = "localhost:17000"
 ocmshareprovidersvc = "localhost:17000"
 ocminvitemanagersvc = "localhost:17000"
 ocmproviderauthorizersvc = "localhost:17000"
-commit_share_to_storage_grant = false
 datagateway = "http://localhost:17001/data"
 transfer_expires = 6 # give it a moment
+commit_share_to_storage_grant = true
+commit_share_to_storage_ref = true
 
 [grpc.services.authregistry]
 driver = "static"
diff --git a/examples/ocmd/users.demo.json b/examples/ocmd/users.demo.json
index 0f96aeece1..e1b52cb806 100644
--- a/examples/ocmd/users.demo.json
+++ b/examples/ocmd/users.demo.json
@@ -2,7 +2,7 @@
 	{
 		"id": {
 			"opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51",
-			"idp": "https://cernbox.cern.ch",
+			"idp": "cernbox.cern.ch",
 			"type": 1
 		},
 		"username": "einstein",
@@ -28,7 +28,7 @@
 	{
 		"id": {
 			"opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
-			"idp": "https://cesnet.cz",
+			"idp": "cesnet.cz",
 			"type": 1
 		},
 		"username": "marie",
@@ -54,7 +54,7 @@
 	{
 		"id": {
 			"opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c",
-			"idp": "https://example.org",
+			"idp": "example.org",
 			"type": 1
 		},
 		"username": "richard",
@@ -80,7 +80,7 @@
 	{
 		"id": {
 			"opaque_id": "932b4522-139b-4815-8ef4-42cdf82c3d51",
-			"idp": "https://example.com",
+			"idp": "example.com",
 			"type": 1
 		},
 		"username": "test",
diff --git a/internal/http/services/ocmd/invites.go b/internal/http/services/ocmd/invites.go
index 0b0c3ff1c8..bd6bb6e647 100644
--- a/internal/http/services/ocmd/invites.go
+++ b/internal/http/services/ocmd/invites.go
@@ -26,7 +26,6 @@ import (
 	"mime"
 	"net/http"
 	"net/url"
-	"strings"
 
 	userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
 	invitepb "github.com/cs3org/go-cs3apis/cs3/ocm/invite/v1beta1"
@@ -239,10 +238,6 @@ func (h *invitesHandler) acceptInvite(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if !(strings.Contains(recipientProvider, "://")) {
-		recipientProvider = "https://" + recipientProvider
-	}
-
 	recipientProviderURL, err := url.Parse(recipientProvider)
 	if err != nil {
 		WriteError(w, r, APIErrorServerError, fmt.Sprintf("error parseing recipientProvider URL: %s", recipientProvider), err)
diff --git a/pkg/ocm/invite/manager/json/json.go b/pkg/ocm/invite/manager/json/json.go
index 6a9b6d483f..076892232f 100644
--- a/pkg/ocm/invite/manager/json/json.go
+++ b/pkg/ocm/invite/manager/json/json.go
@@ -202,13 +202,6 @@ func (m *manager) ForwardInvite(ctx context.Context, invite *invitepb.InviteToke
 	contextUser := ctxpkg.ContextMustGetUser(ctx)
 	recipientProvider := contextUser.GetId().GetIdp()
 
-	// recipientProvider should be a URL, see https://github.com/cs3org/OCM-API/pull/41/files#diff-9cfca4a1b73e1e28e30fb9b0b984aad6d4caaf0819c61ed40ad338600531f745R569
-	// And going forward, UserId Idp will also include the https:// prefix, see https://github.com/cs3org/cs3apis/pull/159
-	// But historically, reva used UserId Idps that were domains instead of full URLs, so we need to support that case too, see
-	// https://github.com/cs3org/reva/issues/2288
-	if !(strings.Contains(recipientProvider, "://")) {
-		recipientProvider = "https://" + recipientProvider
-	}
 	requestBody := url.Values{
 		"token":             {invite.GetToken()},
 		"userID":            {contextUser.GetId().GetOpaqueId()},
diff --git a/pkg/ocm/share/manager/json/json.go b/pkg/ocm/share/manager/json/json.go
index 665c84ed59..25800b867e 100644
--- a/pkg/ocm/share/manager/json/json.go
+++ b/pkg/ocm/share/manager/json/json.go
@@ -254,28 +254,17 @@ func (m *mgr) Share(ctx context.Context, md *provider.ResourceId, g *ocm.ShareGr
 	}
 
 	if isOwnersMeshProvider {
-		// token, ok := ctxpkg.ContextGetToken(ctx)
-		// if !ok {
-		// 	return nil, errors.New("Could not get token from context")
-		// }
-		var protocol map[string]interface{}
+		protocol := map[string]interface{}{
+			"name": "webdav",
+			"options": map[string]string{
+				"permissions": pm,
+				"token":       ctxpkg.ContextMustGetToken(ctx),
+			},
+		}
 		if st == ocm.Share_SHARE_TYPE_TRANSFER {
-			protocol = map[string]interface{}{
-				"name": "datatx",
-				"options": map[string]string{
-					"permissions": pm,
-					"token":       token,
-				},
-			}
-		} else {
-			protocol = map[string]interface{}{
-				"name": "webdav",
-				"options": map[string]string{
-					"permissions": pm,
-					"token":       token,
-				},
-			}
+			protocol["name"] = "datatx"
 		}
+
 		requestBodyMap := map[string]interface{}{
 			"shareWith":    g.Grantee.GetUserId().OpaqueId,
 			"name":         name,