diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
index c3a6f1db5b..cd90d103da 100644
--- a/.bingo/Variables.mk
+++ b/.bingo/Variables.mk
@@ -1,4 +1,4 @@
-# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.5.2. DO NOT EDIT.
+# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.6. DO NOT EDIT.
 # All tools are designed to be build inside $GOBIN.
 BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 GOPATH ?= $(shell go env GOPATH)
diff --git a/.bingo/variables.env b/.bingo/variables.env
index e19cf5f1db..d64a412b02 100644
--- a/.bingo/variables.env
+++ b/.bingo/variables.env
@@ -1,4 +1,4 @@
-# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.5.2. DO NOT EDIT.
+# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.6. DO NOT EDIT.
 # All tools are designed to be build inside $GOBIN.
 # Those variables will work only until 'bingo get' was invoked, or if tools were installed via Makefile's Variables.mk.
 GOBIN=${GOBIN:=$(go env GOBIN)}
diff --git a/extensions/accounts/pkg/config/defaults/defaultconfig.go b/extensions/accounts/pkg/config/defaults/defaultconfig.go
index af60edfb6e..6aaea79f33 100644
--- a/extensions/accounts/pkg/config/defaults/defaultconfig.go
+++ b/extensions/accounts/pkg/config/defaults/defaultconfig.go
@@ -10,10 +10,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
 	Sanitize(cfg)
-
 	return cfg
 }
 
diff --git a/extensions/accounts/pkg/config/parser/parse.go b/extensions/accounts/pkg/config/parser/parse.go
index 91d47c19d8..514de074f7 100644
--- a/extensions/accounts/pkg/config/parser/parse.go
+++ b/extensions/accounts/pkg/config/parser/parse.go
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/appprovider/pkg/config/defaults/defaultconfig.go b/extensions/appprovider/pkg/config/defaults/defaultconfig.go
index e556735ee7..c42cfa27ef 100644
--- a/extensions/appprovider/pkg/config/defaults/defaultconfig.go
+++ b/extensions/appprovider/pkg/config/defaults/defaultconfig.go
@@ -6,9 +6,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
-
+	Sanitize(cfg)
 	return cfg
 }
 
diff --git a/extensions/appprovider/pkg/config/parser/parse.go b/extensions/appprovider/pkg/config/parser/parse.go
index 272df5fde4..fa55c4653f 100644
--- a/extensions/appprovider/pkg/config/parser/parse.go
+++ b/extensions/appprovider/pkg/config/parser/parse.go
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/audit/pkg/config/defaults/defaultconfig.go b/extensions/audit/pkg/config/defaults/defaultconfig.go
index 27b94a8147..f6ec2fb31e 100644
--- a/extensions/audit/pkg/config/defaults/defaultconfig.go
+++ b/extensions/audit/pkg/config/defaults/defaultconfig.go
@@ -6,10 +6,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
 	Sanitize(cfg)
-
 	return cfg
 }
 
diff --git a/extensions/audit/pkg/config/parser/parse.go b/extensions/audit/pkg/config/parser/parse.go
index 7c9179761c..fef33a6b52 100644
--- a/extensions/audit/pkg/config/parser/parse.go
+++ b/extensions/audit/pkg/config/parser/parse.go
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/auth-basic/pkg/config/defaults/defaultconfig.go b/extensions/auth-basic/pkg/config/defaults/defaultconfig.go
index 3f5f851b9d..3bfbaf800f 100644
--- a/extensions/auth-basic/pkg/config/defaults/defaultconfig.go
+++ b/extensions/auth-basic/pkg/config/defaults/defaultconfig.go
@@ -9,9 +9,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
-
+	Sanitize(cfg)
 	return cfg
 }
 
diff --git a/extensions/auth-basic/pkg/config/parser/parse.go b/extensions/auth-basic/pkg/config/parser/parse.go
index 3a850615ca..f24e99c95b 100644
--- a/extensions/auth-basic/pkg/config/parser/parse.go
+++ b/extensions/auth-basic/pkg/config/parser/parse.go
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/auth-bearer/pkg/config/defaults/defaultconfig.go b/extensions/auth-bearer/pkg/config/defaults/defaultconfig.go
index 93a978a2a3..59d0acd706 100644
--- a/extensions/auth-bearer/pkg/config/defaults/defaultconfig.go
+++ b/extensions/auth-bearer/pkg/config/defaults/defaultconfig.go
@@ -6,9 +6,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
-
+	Sanitize(cfg)
 	return cfg
 }
 
diff --git a/extensions/auth-bearer/pkg/config/parser/parse.go b/extensions/auth-bearer/pkg/config/parser/parse.go
index 6ea2a14847..a521c0bfd7 100644
--- a/extensions/auth-bearer/pkg/config/parser/parse.go
+++ b/extensions/auth-bearer/pkg/config/parser/parse.go
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/auth-machine/pkg/config/defaults/defaultconfig.go b/extensions/auth-machine/pkg/config/defaults/defaultconfig.go
index 14be9c67d1..47b0f1a16a 100644
--- a/extensions/auth-machine/pkg/config/defaults/defaultconfig.go
+++ b/extensions/auth-machine/pkg/config/defaults/defaultconfig.go
@@ -1,16 +1,13 @@
 package defaults
 
 import (
-	"log"
-
 	"github.com/owncloud/ocis/extensions/auth-machine/pkg/config"
 )
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
-
+	Sanitize(cfg)
 	return cfg
 }
 
@@ -78,8 +75,6 @@ func EnsureDefaults(cfg *config.Config) {
 
 	if cfg.AuthProviders.Machine.APIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
 		cfg.AuthProviders.Machine.APIKey = cfg.Commons.MachineAuthAPIKey
-	} else if cfg.AuthProviders.Machine.APIKey == "" {
-		log.Fatalf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
 	}
 }
 
diff --git a/extensions/auth-machine/pkg/config/parser/parse.go b/extensions/auth-machine/pkg/config/parser/parse.go
index defc64e0c3..feea7ec411 100644
--- a/extensions/auth-machine/pkg/config/parser/parse.go
+++ b/extensions/auth-machine/pkg/config/parser/parse.go
@@ -2,6 +2,7 @@ package parser
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/owncloud/ocis/extensions/auth-machine/pkg/config"
 	"github.com/owncloud/ocis/extensions/auth-machine/pkg/config/defaults"
@@ -29,5 +30,12 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
+	if cfg.AuthProviders.Machine.APIKey == "" {
+		return fmt.Errorf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
+	}
 	return nil
 }
diff --git a/extensions/frontend/pkg/config/defaults/defaultconfig.go b/extensions/frontend/pkg/config/defaults/defaultconfig.go
index 485b0d2e5c..95256201f2 100644
--- a/extensions/frontend/pkg/config/defaults/defaultconfig.go
+++ b/extensions/frontend/pkg/config/defaults/defaultconfig.go
@@ -1,16 +1,13 @@
 package defaults
 
 import (
-	"log"
-
 	"github.com/owncloud/ocis/extensions/frontend/pkg/config"
 )
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
-
+	Sanitize(cfg)
 	return cfg
 }
 
@@ -114,8 +111,6 @@ func EnsureDefaults(cfg *config.Config) {
 
 	if cfg.TransferSecret == "" && cfg.Commons != nil && cfg.Commons.TransferSecret != "" {
 		cfg.TransferSecret = cfg.Commons.TransferSecret
-	} else if cfg.TransferSecret == "" {
-		log.Fatalf("reva transfer secret is not set up properly, bailing out (%s)", cfg.Service.Name)
 	}
 }
 
diff --git a/extensions/frontend/pkg/config/parser/parse.go b/extensions/frontend/pkg/config/parser/parse.go
index 7942a1b235..d628cfee74 100644
--- a/extensions/frontend/pkg/config/parser/parse.go
+++ b/extensions/frontend/pkg/config/parser/parse.go
@@ -29,5 +29,13 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
+	if cfg.TransferSecret == "" {
+		return ftm.Errorf("reva transfer secret is not set up properly, bailing out (%s)", cfg.Service.Name)
+	}
+
 	return nil
 }
diff --git a/extensions/gateway/pkg/config/defaults/defaultconfig.go b/extensions/gateway/pkg/config/defaults/defaultconfig.go
index d22b3c95ed..21e3cc1862 100644
--- a/extensions/gateway/pkg/config/defaults/defaultconfig.go
+++ b/extensions/gateway/pkg/config/defaults/defaultconfig.go
@@ -1,16 +1,13 @@
 package defaults
 
 import (
-	"log"
-
 	"github.com/owncloud/ocis/extensions/gateway/pkg/config"
 )
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
-
+	Sanitize(cfg)
 	return cfg
 }
 
@@ -105,8 +102,6 @@ func EnsureDefaults(cfg *config.Config) {
 
 	if cfg.TransferSecret == "" && cfg.Commons != nil && cfg.Commons.TransferSecret != "" {
 		cfg.TransferSecret = cfg.Commons.TransferSecret
-	} else if cfg.TransferSecret == "" {
-		log.Fatalf("reva transfer secret is not set up properly, bailing out (%s)", cfg.Service.Name)
 	}
 }
 
diff --git a/extensions/gateway/pkg/config/parser/parse.go b/extensions/gateway/pkg/config/parser/parse.go
index 2ace3feafd..2a0a4e069c 100644
--- a/extensions/gateway/pkg/config/parser/parse.go
+++ b/extensions/gateway/pkg/config/parser/parse.go
@@ -2,6 +2,7 @@ package parser
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/owncloud/ocis/extensions/gateway/pkg/config"
 	"github.com/owncloud/ocis/extensions/gateway/pkg/config/defaults"
@@ -29,5 +30,13 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
+	if cfg.TransferSecret == "" {
+		return fmt.Errorf("reva transfer secret is not set up properly, bailing out (%s)", cfg.Service.Name)
+	}
+
 	return nil
 }
diff --git a/extensions/glauth/pkg/config/defaults/defaultconfig.go b/extensions/glauth/pkg/config/defaults/defaultconfig.go
index 8d0eb366da..d4508ee9d7 100644
--- a/extensions/glauth/pkg/config/defaults/defaultconfig.go
+++ b/extensions/glauth/pkg/config/defaults/defaultconfig.go
@@ -9,10 +9,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
 	Sanitize(cfg)
-
 	return cfg
 }
 
diff --git a/extensions/glauth/pkg/config/parser/parse.go b/extensions/glauth/pkg/config/parser/parse.go
index 532fb51495..175673383c 100644
--- a/extensions/glauth/pkg/config/parser/parse.go
+++ b/extensions/glauth/pkg/config/parser/parse.go
@@ -28,5 +28,10 @@ func ParseConfig(cfg *config.Config) error {
 
 	// sanitize config
 	defaults.Sanitize(cfg)
+
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/graph-explorer/pkg/config/defaults/defaultconfig.go b/extensions/graph-explorer/pkg/config/defaults/defaultconfig.go
index a343da50af..27b194940a 100644
--- a/extensions/graph-explorer/pkg/config/defaults/defaultconfig.go
+++ b/extensions/graph-explorer/pkg/config/defaults/defaultconfig.go
@@ -8,10 +8,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
 	Sanitize(cfg)
-
 	return cfg
 }
 
diff --git a/extensions/graph-explorer/pkg/config/parser/parse.go b/extensions/graph-explorer/pkg/config/parser/parse.go
index 499fbb8f36..82bc9cc5db 100644
--- a/extensions/graph-explorer/pkg/config/parser/parse.go
+++ b/extensions/graph-explorer/pkg/config/parser/parse.go
@@ -30,5 +30,9 @@ func ParseConfig(cfg *config.Config) error {
 	// sanitize config
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/graph/pkg/config/defaults/defaultconfig.go b/extensions/graph/pkg/config/defaults/defaultconfig.go
index 509189ccc0..77fea10502 100644
--- a/extensions/graph/pkg/config/defaults/defaultconfig.go
+++ b/extensions/graph/pkg/config/defaults/defaultconfig.go
@@ -8,10 +8,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
 	Sanitize(cfg)
-
 	return cfg
 }
 
diff --git a/extensions/graph/pkg/config/parser/parse.go b/extensions/graph/pkg/config/parser/parse.go
index cf4612cc88..7c2505a3f1 100644
--- a/extensions/graph/pkg/config/parser/parse.go
+++ b/extensions/graph/pkg/config/parser/parse.go
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/group/pkg/config/defaults/defaultconfig.go b/extensions/group/pkg/config/defaults/defaultconfig.go
index 9500016057..373e118a4b 100644
--- a/extensions/group/pkg/config/defaults/defaultconfig.go
+++ b/extensions/group/pkg/config/defaults/defaultconfig.go
@@ -9,9 +9,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
-
+	Sanitize(cfg)
 	return cfg
 }
 
diff --git a/extensions/group/pkg/config/parser/parse.go b/extensions/group/pkg/config/parser/parse.go
index d75882a290..fd858020b8 100644
--- a/extensions/group/pkg/config/parser/parse.go
+++ b/extensions/group/pkg/config/parser/parse.go
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/idm/pkg/config/defaults/defaultconfig.go b/extensions/idm/pkg/config/defaults/defaultconfig.go
index dada552c04..25ea4785fe 100644
--- a/extensions/idm/pkg/config/defaults/defaultconfig.go
+++ b/extensions/idm/pkg/config/defaults/defaultconfig.go
@@ -9,10 +9,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
 	Sanitize(cfg)
-
 	return cfg
 }
 
diff --git a/extensions/idm/pkg/config/parser/parse.go b/extensions/idm/pkg/config/parser/parse.go
index 0998543ad0..be598790da 100644
--- a/extensions/idm/pkg/config/parser/parse.go
+++ b/extensions/idm/pkg/config/parser/parse.go
@@ -28,5 +28,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/idp/pkg/config/defaults/defaultconfig.go b/extensions/idp/pkg/config/defaults/defaultconfig.go
index d9b68fb506..23c9def14c 100644
--- a/extensions/idp/pkg/config/defaults/defaultconfig.go
+++ b/extensions/idp/pkg/config/defaults/defaultconfig.go
@@ -10,10 +10,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
 	Sanitize(cfg)
-
 	return cfg
 }
 
diff --git a/extensions/idp/pkg/config/parser/parse.go b/extensions/idp/pkg/config/parser/parse.go
index 101ea85bdc..e285276791 100644
--- a/extensions/idp/pkg/config/parser/parse.go
+++ b/extensions/idp/pkg/config/parser/parse.go
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/nats/pkg/config/defaults/defaultconfig.go b/extensions/nats/pkg/config/defaults/defaultconfig.go
index f9435ff4df..a522ca6785 100644
--- a/extensions/nats/pkg/config/defaults/defaultconfig.go
+++ b/extensions/nats/pkg/config/defaults/defaultconfig.go
@@ -12,10 +12,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
 	Sanitize(cfg)
-
 	return cfg
 }
 
diff --git a/extensions/nats/pkg/config/parser/parse.go b/extensions/nats/pkg/config/parser/parse.go
index 2a427a3bd9..4930b1ccfe 100644
--- a/extensions/nats/pkg/config/parser/parse.go
+++ b/extensions/nats/pkg/config/parser/parse.go
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/notifications/pkg/config/defaults/defaultconfig.go b/extensions/notifications/pkg/config/defaults/defaultconfig.go
index d9622050f9..09d08d13fb 100644
--- a/extensions/notifications/pkg/config/defaults/defaultconfig.go
+++ b/extensions/notifications/pkg/config/defaults/defaultconfig.go
@@ -1,17 +1,13 @@
 package defaults
 
 import (
-	"log"
-
 	"github.com/owncloud/ocis/extensions/notifications/pkg/config"
 )
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
 	Sanitize(cfg)
-
 	return cfg
 }
 
@@ -55,8 +51,6 @@ func EnsureDefaults(cfg *config.Config) {
 
 	if cfg.Notifications.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
 		cfg.Notifications.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
-	} else if cfg.Notifications.MachineAuthAPIKey == "" {
-		log.Fatalf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
 	}
 }
 
diff --git a/extensions/notifications/pkg/config/parser/parse.go b/extensions/notifications/pkg/config/parser/parse.go
index 2a4876a33c..fddb96b24b 100644
--- a/extensions/notifications/pkg/config/parser/parse.go
+++ b/extensions/notifications/pkg/config/parser/parse.go
@@ -2,6 +2,7 @@ package parser
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/owncloud/ocis/extensions/notifications/pkg/config"
 	"github.com/owncloud/ocis/extensions/notifications/pkg/config/defaults"
@@ -29,5 +30,12 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
+	if cfg.Notifications.MachineAuthAPIKey == "" {
+		return fmt.Errorf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
+	}
 	return nil
 }
diff --git a/extensions/ocdav/pkg/config/defaults/defaultconfig.go b/extensions/ocdav/pkg/config/defaults/defaultconfig.go
index d68a150240..b55f9e6513 100644
--- a/extensions/ocdav/pkg/config/defaults/defaultconfig.go
+++ b/extensions/ocdav/pkg/config/defaults/defaultconfig.go
@@ -6,9 +6,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
-
+	Sanitize(cfg)
 	return cfg
 }
 
diff --git a/extensions/ocdav/pkg/config/parser/parse.go b/extensions/ocdav/pkg/config/parser/parse.go
index 84d3821cf7..028d237a31 100644
--- a/extensions/ocdav/pkg/config/parser/parse.go
+++ b/extensions/ocdav/pkg/config/parser/parse.go
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/ocs/pkg/config/defaults/defaultconfig.go b/extensions/ocs/pkg/config/defaults/defaultconfig.go
index 8d387072de..20a3e3ca9e 100644
--- a/extensions/ocs/pkg/config/defaults/defaultconfig.go
+++ b/extensions/ocs/pkg/config/defaults/defaultconfig.go
@@ -1,7 +1,6 @@
 package defaults
 
 import (
-	"log"
 	"strings"
 
 	"github.com/owncloud/ocis/extensions/ocs/pkg/config"
@@ -9,10 +8,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
 	Sanitize(cfg)
-
 	return cfg
 }
 
@@ -91,8 +88,6 @@ func EnsureDefaults(cfg *config.Config) {
 
 	if cfg.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
 		cfg.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
-	} else if cfg.MachineAuthAPIKey == "" {
-		log.Fatalf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
 	}
 }
 
diff --git a/extensions/ocs/pkg/config/parser/parse.go b/extensions/ocs/pkg/config/parser/parse.go
index b9c312ca3d..ce253edd19 100644
--- a/extensions/ocs/pkg/config/parser/parse.go
+++ b/extensions/ocs/pkg/config/parser/parse.go
@@ -2,6 +2,7 @@ package parser
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/owncloud/ocis/extensions/ocs/pkg/config"
 	"github.com/owncloud/ocis/extensions/ocs/pkg/config/defaults"
@@ -29,5 +30,12 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
+	if cfg.MachineAuthAPIKey == "" {
+		return fmt.Errorf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
+	}
 	return nil
 }
diff --git a/extensions/proxy/pkg/config/defaults/defaultconfig.go b/extensions/proxy/pkg/config/defaults/defaultconfig.go
index 43b23207db..61c91de93d 100644
--- a/extensions/proxy/pkg/config/defaults/defaultconfig.go
+++ b/extensions/proxy/pkg/config/defaults/defaultconfig.go
@@ -1,7 +1,6 @@
 package defaults
 
 import (
-	"log"
 	"path"
 	"strings"
 
@@ -188,8 +187,6 @@ func EnsureDefaults(cfg *config.Config) {
 
 	if cfg.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
 		cfg.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
-	} else if cfg.MachineAuthAPIKey == "" {
-		log.Fatalf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
 	}
 
 	if cfg.Reva == nil && cfg.Commons != nil && cfg.Commons.Reva != nil {
diff --git a/extensions/proxy/pkg/config/parser/parse.go b/extensions/proxy/pkg/config/parser/parse.go
index 2f29670f65..5f15fb2938 100644
--- a/extensions/proxy/pkg/config/parser/parse.go
+++ b/extensions/proxy/pkg/config/parser/parse.go
@@ -2,6 +2,7 @@ package parser
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/owncloud/ocis/extensions/proxy/pkg/config"
 	"github.com/owncloud/ocis/extensions/proxy/pkg/config/defaults"
@@ -28,5 +29,13 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
+	if cfg.MachineAuthAPIKey == "" {
+		return fmt.Errorf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
+	}
+
 	return nil
 }
diff --git a/extensions/settings/pkg/config/defaults/defaultconfig.go b/extensions/settings/pkg/config/defaults/defaultconfig.go
index fd04461a2f..a1eeb3c9a9 100644
--- a/extensions/settings/pkg/config/defaults/defaultconfig.go
+++ b/extensions/settings/pkg/config/defaults/defaultconfig.go
@@ -1,7 +1,6 @@
 package defaults
 
 import (
-	"log"
 	"path"
 	"strings"
 
@@ -11,10 +10,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
 	Sanitize(cfg)
-
 	return cfg
 }
 
@@ -95,8 +92,6 @@ func EnsureDefaults(cfg *config.Config) {
 
 	if cfg.Metadata.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
 		cfg.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
-	} else if cfg.MachineAuthAPIKey == "" {
-		log.Fatalf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
 	}
 }
 
diff --git a/extensions/settings/pkg/config/parser/parse.go b/extensions/settings/pkg/config/parser/parse.go
index 3880a7ebbc..5d8310430c 100644
--- a/extensions/settings/pkg/config/parser/parse.go
+++ b/extensions/settings/pkg/config/parser/parse.go
@@ -28,5 +28,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/sharing/pkg/config/defaults/defaultconfig.go b/extensions/sharing/pkg/config/defaults/defaultconfig.go
index 71c66ab8dc..2c00c4267a 100644
--- a/extensions/sharing/pkg/config/defaults/defaultconfig.go
+++ b/extensions/sharing/pkg/config/defaults/defaultconfig.go
@@ -1,7 +1,6 @@
 package defaults
 
 import (
-	"log"
 	"path/filepath"
 
 	"github.com/owncloud/ocis/extensions/sharing/pkg/config"
@@ -10,9 +9,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
-
+	Sanitize(cfg)
 	return cfg
 }
 
@@ -125,14 +123,10 @@ func EnsureDefaults(cfg *config.Config) {
 
 	if cfg.UserSharingDrivers.CS3.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
 		cfg.UserSharingDrivers.CS3.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
-	} else if cfg.UserSharingDrivers.CS3.MachineAuthAPIKey == "" {
-		log.Fatalf("machine auth api key for the cs3 user sharing driver is not set up properly, bailing out (%s)", cfg.Service.Name)
 	}
 
 	if cfg.PublicSharingDrivers.CS3.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
 		cfg.PublicSharingDrivers.CS3.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
-	} else if cfg.PublicSharingDrivers.CS3.MachineAuthAPIKey == "" {
-		log.Fatalf("machine auth api key for the cs3 public sharing driver is not set up properly, bailing out (%s)", cfg.Service.Name)
 	}
 }
 
diff --git a/extensions/sharing/pkg/config/parser/parse.go b/extensions/sharing/pkg/config/parser/parse.go
index 516647c884..84a09cc6d0 100644
--- a/extensions/sharing/pkg/config/parser/parse.go
+++ b/extensions/sharing/pkg/config/parser/parse.go
@@ -2,6 +2,7 @@ package parser
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/owncloud/ocis/extensions/sharing/pkg/config"
 	"github.com/owncloud/ocis/extensions/sharing/pkg/config/defaults"
@@ -29,5 +30,17 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
+	if cfg.PublicSharingDrivers.CS3.MachineAuthAPIKey == "" {
+		return fmt.Errorf("machine auth api key for the cs3 public sharing driver is not set up properly, bailing out (%s)", cfg.Service.Name)
+	}
+
+	if cfg.UserSharingDrivers.CS3.MachineAuthAPIKey == "" {
+		return fmt.Errorf("machine auth api key for the cs3 user sharing driver is not set up properly, bailing out (%s)", cfg.Service.Name)
+	}
+
 	return nil
 }
diff --git a/extensions/storage-metadata/pkg/config/defaults/defaultconfig.go b/extensions/storage-metadata/pkg/config/defaults/defaultconfig.go
index 3922b6f569..270c468f5b 100644
--- a/extensions/storage-metadata/pkg/config/defaults/defaultconfig.go
+++ b/extensions/storage-metadata/pkg/config/defaults/defaultconfig.go
@@ -10,9 +10,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
-
+	Sanitize(cfg)
 	return cfg
 }
 
diff --git a/extensions/storage-metadata/pkg/config/parser/parse.go b/extensions/storage-metadata/pkg/config/parser/parse.go
index 4faf4527fa..ca0d96dbb3 100644
--- a/extensions/storage-metadata/pkg/config/parser/parse.go
+++ b/extensions/storage-metadata/pkg/config/parser/parse.go
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/storage-publiclink/pkg/config/defaults/defaultconfig.go b/extensions/storage-publiclink/pkg/config/defaults/defaultconfig.go
index 5a0fed3a55..47b729c05a 100644
--- a/extensions/storage-publiclink/pkg/config/defaults/defaultconfig.go
+++ b/extensions/storage-publiclink/pkg/config/defaults/defaultconfig.go
@@ -6,9 +6,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
-
+	Sanitize(cfg)
 	return cfg
 }
 
diff --git a/extensions/storage-publiclink/pkg/config/parser/parse.go b/extensions/storage-publiclink/pkg/config/parser/parse.go
index b54c81162e..0379145f73 100644
--- a/extensions/storage-publiclink/pkg/config/parser/parse.go
+++ b/extensions/storage-publiclink/pkg/config/parser/parse.go
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/storage-shares/pkg/config/defaults/defaultconfig.go b/extensions/storage-shares/pkg/config/defaults/defaultconfig.go
index ca46e2ea8e..75a6127e90 100644
--- a/extensions/storage-shares/pkg/config/defaults/defaultconfig.go
+++ b/extensions/storage-shares/pkg/config/defaults/defaultconfig.go
@@ -6,9 +6,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
-
+	Sanitize(cfg)
 	return cfg
 }
 
diff --git a/extensions/storage-shares/pkg/config/parser/parse.go b/extensions/storage-shares/pkg/config/parser/parse.go
index f840317dc5..bda808cb63 100644
--- a/extensions/storage-shares/pkg/config/parser/parse.go
+++ b/extensions/storage-shares/pkg/config/parser/parse.go
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/storage-users/pkg/config/defaults/defaultconfig.go b/extensions/storage-users/pkg/config/defaults/defaultconfig.go
index 0c89cc7a2c..b29e9daa98 100644
--- a/extensions/storage-users/pkg/config/defaults/defaultconfig.go
+++ b/extensions/storage-users/pkg/config/defaults/defaultconfig.go
@@ -10,9 +10,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
-
+	Sanitize(cfg)
 	return cfg
 }
 
diff --git a/extensions/storage-users/pkg/config/parser/parse.go b/extensions/storage-users/pkg/config/parser/parse.go
index d8d881260c..55658def29 100644
--- a/extensions/storage-users/pkg/config/parser/parse.go
+++ b/extensions/storage-users/pkg/config/parser/parse.go
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/storage/pkg/config/defaults/defaultconfig.go b/extensions/storage/pkg/config/defaults/defaultconfig.go
index dbfb6a2219..6b88c6babd 100644
--- a/extensions/storage/pkg/config/defaults/defaultconfig.go
+++ b/extensions/storage/pkg/config/defaults/defaultconfig.go
@@ -1,7 +1,6 @@
 package defaults
 
 import (
-	"log"
 	"os"
 	"path"
 
@@ -21,10 +20,8 @@ const (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
 	Sanitize(cfg)
-
 	return cfg
 }
 
@@ -458,11 +455,9 @@ func DefaultConfig() *config.Config {
 }
 
 func EnsureDefaults(cfg *config.Config) {
-	if cfg.TransferSecret == "" && cfg.Commons != nil && cfg.Commons.TransferSecret != "" {
-		cfg.TransferSecret = cfg.Commons.TransferSecret
-	} else {
-		log.Fatal("reva transfer secret is not set up properly, bailing out (storage)")
-	}
+	//if cfg.TransferSecret == "" && cfg.Commons != nil && cfg.Commons.TransferSecret != "" {
+	//	cfg.TransferSecret = cfg.Commons.TransferSecret
+	//}
 }
 
 func Sanitize(cfg *config.Config) {
diff --git a/extensions/storage/pkg/config/parser/parse.go b/extensions/storage/pkg/config/parser/parse.go
index 4faf4527fa..bf30c761ff 100644
--- a/extensions/storage/pkg/config/parser/parse.go
+++ b/extensions/storage/pkg/config/parser/parse.go
@@ -2,6 +2,7 @@ package parser
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config"
 	"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config/defaults"
@@ -29,5 +30,12 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
+	if cfg.TransferSecret == "" {
+		return fmt.Errorf("reva transfer secret is not set up properly, bailing out (storage)")
+	}
 	return nil
 }
diff --git a/extensions/store/pkg/config/defaults/defaultconfig.go b/extensions/store/pkg/config/defaults/defaultconfig.go
index 1d84c1c474..8932d4266a 100644
--- a/extensions/store/pkg/config/defaults/defaultconfig.go
+++ b/extensions/store/pkg/config/defaults/defaultconfig.go
@@ -9,10 +9,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
 	Sanitize(cfg)
-
 	return cfg
 }
 
diff --git a/extensions/store/pkg/config/parser/parse.go b/extensions/store/pkg/config/parser/parse.go
index 7c9f02bda3..3d3b591ba7 100644
--- a/extensions/store/pkg/config/parser/parse.go
+++ b/extensions/store/pkg/config/parser/parse.go
@@ -29,5 +29,10 @@ func ParseConfig(cfg *config.Config) error {
 
 	// sanitize config
 	defaults.Sanitize(cfg)
+
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/thumbnails/pkg/config/defaults/defaultconfig.go b/extensions/thumbnails/pkg/config/defaults/defaultconfig.go
index dd8b57d211..b24c9e3d11 100644
--- a/extensions/thumbnails/pkg/config/defaults/defaultconfig.go
+++ b/extensions/thumbnails/pkg/config/defaults/defaultconfig.go
@@ -1,7 +1,6 @@
 package defaults
 
 import (
-	"log"
 	"path"
 
 	"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
@@ -10,10 +9,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
 	Sanitize(cfg)
-
 	return cfg
 }
 
@@ -76,8 +73,6 @@ func EnsureDefaults(cfg *config.Config) {
 
 	if cfg.Thumbnail.TransferSecret == "" && cfg.Commons != nil && cfg.Commons.TransferSecret != "" {
 		cfg.Thumbnail.TransferSecret = cfg.Commons.TransferSecret
-	} else if cfg.TransferSecret == "" {
-		log.Fatalf("reva transfer secret is not set up properly, bailing out (%s)", cfg.Service.Name)
 	}
 }
 
diff --git a/extensions/thumbnails/pkg/config/parser/parse.go b/extensions/thumbnails/pkg/config/parser/parse.go
index 4ed7325534..348e87d1a1 100644
--- a/extensions/thumbnails/pkg/config/parser/parse.go
+++ b/extensions/thumbnails/pkg/config/parser/parse.go
@@ -2,6 +2,7 @@ package parser
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
 	"github.com/owncloud/ocis/extensions/thumbnails/pkg/config/defaults"
@@ -30,5 +31,13 @@ func ParseConfig(cfg *config.Config) error {
 	// sanitize config
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
+	if cfg.TransferSecret == "" {
+		return fmt.Errorf("reva transfer secret is not set up properly, bailing out (%s)", cfg.Service.Name)
+	}
+
 	return nil
 }
diff --git a/extensions/user/pkg/config/defaults/defaultconfig.go b/extensions/user/pkg/config/defaults/defaultconfig.go
index f20c546123..b7212abd0b 100644
--- a/extensions/user/pkg/config/defaults/defaultconfig.go
+++ b/extensions/user/pkg/config/defaults/defaultconfig.go
@@ -9,9 +9,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
-
+	Sanitize(cfg)
 	return cfg
 }
 
diff --git a/extensions/user/pkg/config/parser/parse.go b/extensions/user/pkg/config/parser/parse.go
index 06145d3ad8..e2e6ad69ed 100644
--- a/extensions/user/pkg/config/parser/parse.go
+++ b/extensions/user/pkg/config/parser/parse.go
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/web/pkg/config/defaults/defaultconfig.go b/extensions/web/pkg/config/defaults/defaultconfig.go
index bbfad9bdfd..023a080da8 100644
--- a/extensions/web/pkg/config/defaults/defaultconfig.go
+++ b/extensions/web/pkg/config/defaults/defaultconfig.go
@@ -8,10 +8,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
 	Sanitize(cfg)
-
 	return cfg
 }
 
diff --git a/extensions/web/pkg/config/parser/parse.go b/extensions/web/pkg/config/parser/parse.go
index d850943577..80e64a3b7b 100644
--- a/extensions/web/pkg/config/parser/parse.go
+++ b/extensions/web/pkg/config/parser/parse.go
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }
diff --git a/extensions/webdav/pkg/config/defaults/defaultconfig.go b/extensions/webdav/pkg/config/defaults/defaultconfig.go
index 48e00e17f1..3c975cfa70 100644
--- a/extensions/webdav/pkg/config/defaults/defaultconfig.go
+++ b/extensions/webdav/pkg/config/defaults/defaultconfig.go
@@ -8,10 +8,8 @@ import (
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
 	Sanitize(cfg)
-
 	return cfg
 }
 
diff --git a/extensions/webdav/pkg/config/parser/parse.go b/extensions/webdav/pkg/config/parser/parse.go
index 7597255f9c..9d4d15ca7a 100644
--- a/extensions/webdav/pkg/config/parser/parse.go
+++ b/extensions/webdav/pkg/config/parser/parse.go
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
 
 	defaults.Sanitize(cfg)
 
+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }