3 files changed, 5 insertions, 3 deletions
diff --git a/plugins/carddav/public/address-book.html b/plugins/carddav/public/address-book.html
index 3c31017..d4e13b9 100644
--- a/plugins/carddav/public/address-book.html
+++ b/plugins/carddav/public/address-book.html
@@ -17,7 +17,7 @@
   <ul>
     {{range .AddressObjects}}
       <li>
-        <a href="/contacts/{{.Card.Value "UID" | pathescape}}">
+        <a href="{{.URL}}">
           {{.Card.Value "FN"}}
         </a>
         {{$email := .Card.PreferredValue "EMAIL"}}
diff --git a/plugins/carddav/public/address-object.html b/plugins/carddav/public/address-object.html
index 1d564ee..e4ec135 100644
--- a/plugins/carddav/public/address-object.html
+++ b/plugins/carddav/public/address-object.html
@@ -11,7 +11,7 @@
 <h2>Contact: {{$fn}}</h2>
 
 <p>
-  <a href="/contacts/{{.AddressObject.Card.Value "UID" | pathescape}}/edit">
+  <a href="{{.AddressObject.URL}}/edit">
     Edit
   </a>
 </p>
diff --git a/plugins/carddav/public/update-address-object.html b/plugins/carddav/public/update-address-object.html
index b0ab20f..82adf8e 100644
--- a/plugins/carddav/public/update-address-object.html
+++ b/plugins/carddav/public/update-address-object.html
@@ -6,7 +6,9 @@
   <a href="/contacts">Back</a>
 </p>
 
-<h2>Edit contact</h2>
+<h2>
+  {{if .Card}}Edit{{else}}Create{{end}} contact
+</h2>
 
 <form method="post">
   <label for="fn">Name:</label>