diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/Member.java b/core/src/main/java/de/srsoftware/umbrella/core/model/Member.java
index f04624d..a7becc8 100644
--- a/core/src/main/java/de/srsoftware/umbrella/core/model/Member.java
+++ b/core/src/main/java/de/srsoftware/umbrella/core/model/Member.java
@@ -5,12 +5,17 @@ package de.srsoftware.umbrella.core.model;
 import static de.srsoftware.umbrella.core.Constants.*;
 
 import de.srsoftware.tools.Mappable;
+
+import java.util.HashMap;
 import java.util.Map;
 
 public record Member(UmbrellaUser user, Permission permission) implements Mappable {
 	@Override
 	public Map<String, Object> toMap() {
-		return Map.of(USER,user.toMap(),PERMISSION,permission.toMap());
+		var map = new HashMap<String,Object>();
+		map.put(USER,user == null ? null : user.toMap());
+		map.put(PERMISSION,permission.toMap());
+		return map;
 	}
 
 	public boolean mayWrite() {
diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte
index 1f8df07..e7ac232 100644
--- a/frontend/src/App.svelte
+++ b/frontend/src/App.svelte
@@ -100,11 +100,12 @@
         </Router>
     {:else}
         <Router>
-        <Route path="/user/reset/pw" component={ResetPw} />
-        <Route path="/oidc_callback" component={Callback} />
-        <Route>
-            <Login />
-        </Route>
+            <Route path="/user/reset/pw"  component={ResetPw} />
+            <Route path="/oidc_callback"  component={Callback} />
+            <Route path="/wiki/:key/view" component={WikiPage} />
+            <Route>
+                <Login />
+            </Route>
         </Router>
     {/if}
     <Footer />