diff --git a/src/domain/RootViewModel.js b/src/domain/RootViewModel.js
index 1bfb5626..91f144c7 100644
--- a/src/domain/RootViewModel.js
+++ b/src/domain/RootViewModel.js
@@ -38,8 +38,7 @@ export class RootViewModel extends ViewModel {
         this.track(this.navigation.observe("login").subscribe(() => this._applyNavigation()));
         this.track(this.navigation.observe("session").subscribe(() => this._applyNavigation()));
         this.track(this.navigation.observe("sso").subscribe(() => this._applyNavigation()));
-        this.track(this.navigation.observe("oidc-callback").subscribe(() => this._applyNavigation()));
-        this.track(this.navigation.observe("oidc-error").subscribe(() => this._applyNavigation()));
+        this.track(this.navigation.observe("oidc").subscribe(() => this._applyNavigation()));
         this._applyNavigation(true);
     }
 
@@ -48,8 +47,7 @@ export class RootViewModel extends ViewModel {
         const logoutSessionId = this.navigation.path.get("logout")?.value;
         const sessionId = this.navigation.path.get("session")?.value;
         const loginToken = this.navigation.path.get("sso")?.value;
-        const oidcCallback = this.navigation.path.get("oidc-callback")?.value;
-        const oidcError = this.navigation.path.get("oidc-error")?.value;
+        const oidcCallback = this.navigation.path.get("oidc")?.value;
         if (isLogin) {
             if (this.activeSection !== "login") {
                 this._showLogin();
@@ -83,18 +81,16 @@ export class RootViewModel extends ViewModel {
             if (this.activeSection !== "login") {
                 this._showLogin({loginToken});
             }
-        } else if (oidcError) {
-            this._setSection(() => this._error = new Error(`OIDC error: ${oidcError[1]}`));
         } else if (oidcCallback) {
-            this._setSection(() => this._error = new Error(`OIDC callback: state=${oidcCallback[0]}, code=${oidcCallback[1]}`));
-            this.urlCreator.normalizeUrl();
-            if (this.activeSection !== "login") {
-                this._showLogin({
-                    oidc: {
-                        state: oidcCallback[0],
-                        code: oidcCallback[1],
-                    }
-                });
+            if (oidcCallback.error) {
+                this._setSection(() => this._error = new Error(`OIDC error: ${oidcCallback.error}`));
+            } else {
+                this.urlCreator.normalizeUrl();
+                if (this.activeSection !== "login") {
+                    this._showLogin({
+                        oidc: oidcCallback,
+                    });
+                }
             }
         }
         else {
diff --git a/src/domain/navigation/index.js b/src/domain/navigation/index.js
index 7ee75c50..bd4dd0db 100644
--- a/src/domain/navigation/index.js
+++ b/src/domain/navigation/index.js
@@ -30,7 +30,7 @@ function allowsChild(parent, child) {
     switch (parent?.type) {
         case undefined:
             // allowed root segments
-            return type === "login" || type === "session" || type === "sso" || type === "logout" || type === "oidc-callback" || type === "oidc-error";
+            return type === "login" || type === "session" || type === "sso" || type === "logout" || type === "oidc";
         case "session":
             return type === "room" || type === "rooms" || type === "settings" || type === "create-room";
         case "rooms":
@@ -113,18 +113,18 @@ export function parseUrlPath(urlPath, currentNavPath, defaultSessionId) {
         if (params.has("state")) {
             // This is a proper OIDC callback
             if (params.has("code")) {
-                segments.push(new Segment("oidc-callback", [
-                    params.get("state"),
-                    params.get("code"),
-                ]));
+                segments.push(new Segment("oidc", {
+                    state: params.get("state"),
+                    code: params.get("code"),
+                }));
                 return segments;
             } else if (params.has("error")) {
-                segments.push(new Segment("oidc-error", [
-                    params.get("state"),
-                    params.get("error"),
-                    params.get("error_description"),
-                    params.get("error_uri"),
-                ]));
+                segments.push(new Segment("oidc", {
+                    state: params.get("state"),
+                    error: params.get("error"),
+                    errorDescription: params.get("error_description"),
+                    errorUri: params.get("error_uri"),
+                }));
                 return segments;
             }
         }
@@ -483,20 +483,20 @@ export function tests() {
         "Parse OIDC callback": assert => {
             const segments = parseUrlPath("state=tc9CnLU7&code=cnmUnwIYtY7V8RrWUyhJa4yvX72jJ5Yx");
             assert.equal(segments.length, 1);
-            assert.equal(segments[0].type, "oidc-callback");
-            assert.deepEqual(segments[0].value, ["tc9CnLU7", "cnmUnwIYtY7V8RrWUyhJa4yvX72jJ5Yx"]);
+            assert.equal(segments[0].type, "oidc");
+            assert.deepEqual(segments[0].value, {state: "tc9CnLU7", code: "cnmUnwIYtY7V8RrWUyhJa4yvX72jJ5Yx"});
         },
         "Parse OIDC error": assert => {
             const segments = parseUrlPath("state=tc9CnLU7&error=invalid_request");
             assert.equal(segments.length, 1);
-            assert.equal(segments[0].type, "oidc-error");
-            assert.deepEqual(segments[0].value, ["tc9CnLU7", "invalid_request", null, null]);
+            assert.equal(segments[0].type, "oidc");
+            assert.deepEqual(segments[0].value, {state: "tc9CnLU7", error: "invalid_request", errorUri: null, errorDescription: null});
         },
         "Parse OIDC error with description": assert => {
             const segments = parseUrlPath("state=tc9CnLU7&error=invalid_request&error_description=Unsupported%20response_type%20value");
             assert.equal(segments.length, 1);
-            assert.equal(segments[0].type, "oidc-error");
-            assert.deepEqual(segments[0].value, ["tc9CnLU7", "invalid_request", "Unsupported response_type value", null]);
+            assert.equal(segments[0].type, "oidc");
+            assert.deepEqual(segments[0].value, {state: "tc9CnLU7", error: "invalid_request", errorDescription: "Unsupported response_type value", errorUri: null});
         },
     }
 }