diff --git a/config/server/groupware/radicale.nix b/config/server/groupware/radicale.nix
index 22234f2..2c79961 100644
--- a/config/server/groupware/radicale.nix
+++ b/config/server/groupware/radicale.nix
@@ -10,10 +10,7 @@
 
     settings = {
       auth = {
-        type = "imap";
-
-        # imap_host = "localhost";
-        # imap_security = "tls";
+        urldecode_username = true;
 
         cache_logins = true;
       };
diff --git a/hosts/index/config/groupware/radicale.nix b/hosts/index/config/groupware/radicale.nix
new file mode 100644
index 0000000..fd30d41
--- /dev/null
+++ b/hosts/index/config/groupware/radicale.nix
@@ -0,0 +1,32 @@
+{ flakeRoot, ... }:
+
+let
+  radicaleModule = import (flakeRoot + /config/server/groupware/radicale.nix) {
+    hosts = [
+      {
+        name = "radicale.lan";
+        ssl = "internal";
+      }
+      {
+        name = "dav.encrypted.group";
+        ssl = "cloudflare";
+
+        useLocal = true;
+      }
+    ];
+  };
+in
+{
+  imports = [
+    radicaleModule
+  ];
+
+  services.radicale.settings = {
+    auth = {
+      type = "imap";
+
+      imap_host = "localhost:113";
+      imap_security = "none";
+    };    
+  };
+}
diff --git a/hosts/index/default.nix b/hosts/index/default.nix
index d0c617e..49201a1 100644
--- a/hosts/index/default.nix
+++ b/hosts/index/default.nix
@@ -41,6 +41,7 @@ in
 
     ./config/groupware/cells.nix
     ./config/groupware/maddy.nix
+    ./config/groupware/radicale.nix
 
     ./config/media/audiobookshelf.nix
     ./config/media/emby.nix