diff --git a/changelog/unreleased/fix-createhome-middleware.md b/changelog/unreleased/fix-createhome-middleware.md
new file mode 100644
index 000000000..5fd39993e
--- /dev/null
+++ b/changelog/unreleased/fix-createhome-middleware.md
@@ -0,0 +1,5 @@
+Bugfix: Provide token configuration from config
+
+Fixed a bug that causes the createHome middleware to crash if no configuration for the TokenManager is propagated.
+
+https://github.com/owncloud/ocis-proxy/pull/69
diff --git a/config/proxy-example-migration.json b/config/proxy-example-migration.json
index 408178697..04760b75a 100644
--- a/config/proxy-example-migration.json
+++ b/config/proxy-example-migration.json
@@ -3,9 +3,7 @@
     "Namespace": "com.owncloud"
   },
   "oidc": {
-    "endpoint": "https://localhost:9200",
-    "realm": "",
-    "signing_algs": ["RS256", "PS256"],
+    "issuer": "https://localhost:9200",
     "insecure": true
   },
   "policy_selector": {
diff --git a/config/proxy-example.json b/config/proxy-example.json
index bac66bace..b8e5063cb 100644
--- a/config/proxy-example.json
+++ b/config/proxy-example.json
@@ -3,9 +3,7 @@
     "Namespace": "com.owncloud"
   },
   "oidc": {
-    "endpoint": "https://localhost:9200",
-    "realm": "",
-    "signing_algs": ["RS256", "PS256"],
+    "issuer": "https://localhost:9200",
     "insecure": true
   },
   "policy_selector": {
diff --git a/pkg/command/server.go b/pkg/command/server.go
index e54590449..e9b30b9dd 100644
--- a/pkg/command/server.go
+++ b/pkg/command/server.go
@@ -296,6 +296,7 @@ func loadMiddlewares(ctx context.Context, l log.Logger, cfg *config.Config) alic
 			middleware.Logger(l),
 			middleware.RevaGatewayClient(sc),
 			middleware.AccountsClient(accounts),
+			middleware.TokenManagerConfig(cfg.TokenManager),
 		)
 
 		return alice.New(middleware.RedirectToHTTPS, oidcMW, uuidMW, chMW)
diff --git a/pkg/middleware/create_home.go b/pkg/middleware/create_home.go
index 480d62616..e2825439f 100644
--- a/pkg/middleware/create_home.go
+++ b/pkg/middleware/create_home.go
@@ -25,6 +25,7 @@ func CreateHome(opts ...Option) func(next http.Handler) http.Handler {
 				"secret": opt.TokenManagerConfig.JWTSecret,
 			})
 			if err != nil {
+				opt.Logger.Error().Err(err).Msg("error creating a token manager")
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}