diff --git a/crates/frontend/public/templates/pages/user.html b/crates/frontend/public/templates/pages/user.html
index c8ff8a2..c1e8765 100644
--- a/crates/frontend/public/templates/pages/user.html
+++ b/crates/frontend/public/templates/pages/user.html
@@ -108,48 +108,51 @@
 </ul>
 {% endif %}
 
-<h3>Create calendar</h3>
-    <form action="/frontend/user/{{ user.id }}/calendar" method="POST">
-      <label>
-        href
-        <input type="text" name="id" />
-      </label>
-      <br>
-      <label>
-        Displayname
-        <input type="text" name="displayname" />
-      </label>
-      <br>
-      <label>
-        Description
-        <input type="text" name="description" />
-      </label>
-      <br>
-      <label>
-        Color
-        <input type="color" name="color" />
-      </label>
-      <br>
-      <label>
-        Subscription URL
-        <input type="text" name="subscription_url" />
-      </label>
-      <br>
-      <label>
-        Support VEVENT
-        <input type="checkbox" name="comp_event" checked />
-      </label>
-      <label>
-        Support VTODO
-        <input type="checkbox" name="comp_todo" checked />
-      </label>
-      <label>
-        Support VJOURNAL
-        <input type="checkbox" name="comp_journal" />
-      </label>
-      <br>
-      <button type="submit">Create</button>
-    </form>
+<section>
+  <h3>Create calendar</h3>
+  <form action="/frontend/user/{{ user.id }}/calendar" method="POST">
+    <label>
+      href
+      <input type="text" name="id" />
+    </label>
+    <br>
+    <label>
+      Displayname
+      <input type="text" name="displayname" />
+    </label>
+    <br>
+    <label>
+      Description
+      <input type="text" name="description" />
+    </label>
+    <br>
+    <label>
+      Color
+      <input type="color" name="color" />
+    </label>
+    <br>
+    <label>
+      Subscription URL
+      <input type="text" name="subscription_url" />
+    </label>
+    <br>
+    <label>
+      Support VEVENT
+      <input type="checkbox" name="comp_event" checked />
+    </label>
+    <label>
+      Support VTODO
+      <input type="checkbox" name="comp_todo" checked />
+    </label>
+    <label>
+      Support VJOURNAL
+      <input type="checkbox" name="comp_journal" />
+    </label>
+    <br>
+    <button type="submit">Create</button>
+  </form>
+</section>
+
 </section>
 
 <section>
@@ -186,6 +189,29 @@
   {% endfor %}
 </ul>
 {% endif %}
+
+<section>
+  <h3>Create addressbook</h3>
+  <form action="/frontend/user/{{ user.id }}/addressbook" method="POST">
+    <label>
+      href
+      <input type="text" name="id" />
+    </label>
+    <br>
+    <label>
+      Displayname
+      <input type="text" name="displayname" />
+    </label>
+    <br>
+    <label>
+      Description
+      <input type="text" name="description" />
+    </label>
+    <br>
+    <button type="submit">Create</button>
+  </form>
+</section>
+
 </section>
 {% endblock %}
 
diff --git a/crates/frontend/src/lib.rs b/crates/frontend/src/lib.rs
index 4378b89..b739d9c 100644
--- a/crates/frontend/src/lib.rs
+++ b/crates/frontend/src/lib.rs
@@ -32,7 +32,7 @@ use oidc_user_store::OidcUserStore;
 use crate::{
     assets::{Assets, EmbedService},
     routes::{
-        addressbook::{route_addressbook, route_addressbook_restore},
+        addressbook::{route_addressbook, route_addressbook_restore, route_create_addressbook},
         app_token::{route_delete_app_token, route_post_app_token},
         calendar::{route_calendar, route_calendar_restore, route_create_calendar},
         login::{route_get_login, route_post_login, route_post_logout},
@@ -76,6 +76,10 @@ pub fn frontend_router<
             post(route_calendar_restore::<CS>),
         )
         // Addressbook
+        .route(
+            "/user/{user}/addressbook",
+            post(route_create_addressbook::<AS>),
+        )
         .route(
             "/user/{user}/addressbook/{addressbook}",
             get(route_addressbook::<AS>),
diff --git a/crates/frontend/src/routes/addressbook.rs b/crates/frontend/src/routes/addressbook.rs
index 91f6809..d4eada0 100644
--- a/crates/frontend/src/routes/addressbook.rs
+++ b/crates/frontend/src/routes/addressbook.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use askama::Template;
 use askama_web::WebTemplate;
 use axum::{
-    Extension,
+    Extension, Form,
     extract::Path,
     response::{IntoResponse, Redirect, Response},
 };
@@ -11,6 +11,7 @@ use axum_extra::TypedHeader;
 use headers::Referer;
 use http::StatusCode;
 use rustical_store::{Addressbook, AddressbookStore, auth::User};
+use serde::{Deserialize, Deserializer};
 
 #[derive(Template, WebTemplate)]
 #[template(path = "pages/addressbook.html")]
@@ -32,6 +33,53 @@ pub async fn route_addressbook<AS: AddressbookStore>(
     .into_response())
 }
 
+fn empty_to_none<'de, D>(deserializer: D) -> Result<Option<String>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let val: Option<String> = Deserialize::deserialize(deserializer)?;
+    Ok(val.filter(|val| !val.is_empty()))
+}
+
+#[derive(Deserialize, Clone)]
+pub struct PutAddressbookForm {
+    id: String,
+    #[serde(deserialize_with = "empty_to_none")]
+    displayname: Option<String>,
+    #[serde(deserialize_with = "empty_to_none")]
+    description: Option<String>,
+}
+
+pub async fn route_create_addressbook<AS: AddressbookStore>(
+    Path(owner): Path<String>,
+    Extension(store): Extension<Arc<AS>>,
+    user: User,
+    Form(PutAddressbookForm {
+        id,
+        displayname,
+        description,
+    }): Form<PutAddressbookForm>,
+) -> Result<Response, rustical_store::Error> {
+    if !user.is_principal(&owner) {
+        return Ok(StatusCode::UNAUTHORIZED.into_response());
+    }
+
+    assert!(!id.is_empty());
+
+    let addressbook = Addressbook {
+        id: id.to_owned(),
+        displayname,
+        description,
+        principal: user.id.to_owned(),
+        synctoken: 0,
+        deleted_at: None,
+        push_topic: uuid::Uuid::new_v4().to_string(),
+    };
+
+    store.insert_addressbook(addressbook).await?;
+    Ok(Redirect::to(&format!("/frontend/user/{}/addressbook/{}", user.id, id)).into_response())
+}
+
 pub async fn route_addressbook_restore<AS: AddressbookStore>(
     Path((owner, addressbook_id)): Path<(String, String)>,
     Extension(store): Extension<Arc<AS>>,
diff --git a/crates/frontend/src/routes/calendar.rs b/crates/frontend/src/routes/calendar.rs
index db596e7..fe69f21 100644
--- a/crates/frontend/src/routes/calendar.rs
+++ b/crates/frontend/src/routes/calendar.rs
@@ -96,7 +96,7 @@ pub async fn route_create_calendar<C: CalendarStore>(
         description,
         color,
         subscription_url,
-        principal: user.id,
+        principal: user.id.to_owned(),
         components: comps,
         order: 0,
         timezone_id: None,
@@ -107,7 +107,7 @@ pub async fn route_create_calendar<C: CalendarStore>(
     };
 
     store.insert_calendar(cal).await?;
-    Ok(Redirect::to(&id).into_response())
+    Ok(Redirect::to(&format!("/frontend/user/{}/calendar/{}", user.id, id)).into_response())
 }
 
 pub async fn route_calendar_restore<CS: CalendarStore>(