diff --git a/accounts/pkg/config/defaultconfig.go b/accounts/pkg/config/defaultconfig.go
index 394cf2155f..f04d1af2cf 100644
--- a/accounts/pkg/config/defaultconfig.go
+++ b/accounts/pkg/config/defaultconfig.go
@@ -60,7 +60,7 @@ func DefaultConfig() *Config {
 		},
 		ServiceUser: ServiceUser{
 			UUID:     "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
-			Username: "",
+			Username: "service user",
 			UID:      0,
 			GID:      0,
 		},
diff --git a/settings/pkg/config/defaultconfig.go b/settings/pkg/config/defaultconfig.go
index ff41af872e..44d522a5f8 100644
--- a/settings/pkg/config/defaultconfig.go
+++ b/settings/pkg/config/defaultconfig.go
@@ -45,7 +45,7 @@ func DefaultConfig() *Config {
 		Metadata: Metadata{
 			GatewayAddress:    "127.0.0.1:9142",
 			StorageAddress:    "127.0.0.1:9215",
-			ServiceUserID:     "ddc2004c-0977-11eb-9d3f-a793888cd0f8",
+			ServiceUserID:     "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
 			MachineAuthAPIKey: "change-me-please",
 		},
 	}
diff --git a/settings/pkg/service/v0/service.go b/settings/pkg/service/v0/service.go
index a59c17ffce..3d15a226dd 100644
--- a/settings/pkg/service/v0/service.go
+++ b/settings/pkg/service/v0/service.go
@@ -45,7 +45,7 @@ func NewService(cfg *config.Config, logger log.Logger) Service {
 		service.manager = metastore.New(cfg)
 	case "filesystem":
 		service.manager = filestore.New(cfg)
-		// TODO: if we want to further support filesystem store it should use default permissions from store/defaults.go instead using this duplicate
+		// TODO: if we want to further support filesystem store it should use default permissions from store/defaults/defaults.go instead using this duplicate
 		service.RegisterDefaultRoles()
 	}
 	return service
diff --git a/settings/pkg/store/metadata/assignments_test.go b/settings/pkg/store/metadata/assignments_test.go
index 6f75ef1be2..6e7bf3574d 100644
--- a/settings/pkg/store/metadata/assignments_test.go
+++ b/settings/pkg/store/metadata/assignments_test.go
@@ -7,6 +7,7 @@ import (
 
 	olog "github.com/owncloud/ocis/ocis-pkg/log"
 	settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
+	"github.com/owncloud/ocis/settings/pkg/config"
 	"github.com/stretchr/testify/require"
 )
 
@@ -17,6 +18,7 @@ var (
 	s = &Store{
 		Logger: logger,
 		l:      &sync.Mutex{},
+		cfg:    config.DefaultConfig(),
 	}
 
 	logger = olog.NewLogger(
diff --git a/settings/pkg/store/metadata/bundles.go b/settings/pkg/store/metadata/bundles.go
index 816f0e4aa3..766d6cf262 100644
--- a/settings/pkg/store/metadata/bundles.go
+++ b/settings/pkg/store/metadata/bundles.go
@@ -50,7 +50,7 @@ func (s *Store) ListBundles(bundleType settingsmsg.Bundle_Type, bundleIDs []stri
 	return bundles, nil
 }
 
-// ReadBundle tries to find a bundle by the given id within the dataPath.
+// ReadBundle tries to find a bundle by the given id from the metadata service
 func (s *Store) ReadBundle(bundleID string) (*settingsmsg.Bundle, error) {
 	if s.mdc == nil {
 		return defaultBundle(settingsmsg.Bundle_TYPE_ROLE, bundleID)[0], nil
diff --git a/settings/pkg/store/metadata/cache.go b/settings/pkg/store/metadata/cache.go
index 0f036c592d..2b00496202 100644
--- a/settings/pkg/store/metadata/cache.go
+++ b/settings/pkg/store/metadata/cache.go
@@ -2,7 +2,6 @@ package store
 
 import (
 	"context"
-	"fmt"
 	"path"
 	"strings"
 	"time"
@@ -78,9 +77,7 @@ func (c *CachedMDC) ReadDir(ctx context.Context, id string) ([]string, error) {
 		return i.([]string), nil
 	}
 
-	fmt.Println("readdir calling metadataservice", id)
 	s, err := c.next.ReadDir(ctx, id)
-	fmt.Println("readdir calling metadataservice result", s, err)
 	if err != nil {
 		return nil, err
 	}