diff --git a/radicale/rights/regex.py b/radicale/rights/regex.py
index a65381c6..523f7355 100644
--- a/radicale/rights/regex.py
+++ b/radicale/rights/regex.py
@@ -57,8 +57,8 @@ except ImportError:
 DEFINED_RIGHTS = {
     "authenticated": "[rw]\nuser:.+\ncollection:.*\npermission:rw",
     "owner_write": "[r]\nuser:.+\ncollection:.*\npermission:r\n"
-                   "[w]\nuser:.+\ncollection:^%(login)s/.+$\npermission:w",
-    "owner_only": "[rw]\nuser:.+\ncollection:^%(login)s/.+$\npermission:rw",
+                   "[w]\nuser:.+\ncollection:^%(login)s(/.*)?$\npermission:w",
+    "owner_only": "[rw]\nuser:.+\ncollection:^%(login)s(/.*)?$\npermission:rw",
 }