diff --git a/config/hosts/athame/nixos.nix b/config/hosts/athame/nixos.nix
index 0bc669e6..d8acd905 100644
--- a/config/hosts/athame/nixos.nix
+++ b/config/hosts/athame/nixos.nix
@@ -73,7 +73,6 @@ with lib;
     device = "/dev/sda";
   };
 
-
   # Networking
 
   networking = {
diff --git a/config/services/mail/default.nix b/config/services/mail/default.nix
index 0eee267c..ff2bd526 100644
--- a/config/services/mail/default.nix
+++ b/config/services/mail/default.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
   domains = [ "kittywitch" "dork" ];
-  users = [ "gitea" "kat" "keycloak" ];
+  users = [ "gitea" "kat" "keycloak" "vaultwarden" ];
 in
 {
   imports = [ sources.nixos-mailserver.outPath ];
diff --git a/config/services/vaultwarden/default.nix b/config/services/vaultwarden/default.nix
index 2568afe0..8645283f 100644
--- a/config/services/vaultwarden/default.nix
+++ b/config/services/vaultwarden/default.nix
@@ -1,15 +1,23 @@
-{ config, pkgs, lib, tf, ... }:
+{ config, pkgs, lib, tf, ... }: with lib;
 
 {
-  kw.secrets.variables = {
-    vaultwarden-admin-token = {
+  kw.secrets.variables = mapListToAttrs (field:
+    nameValuePair "vaultwarden-${field}" {
       path = "secrets/vaultwarden";
-    };
-  };
+      inherit field;
+    }) [ "password" "smtp" ];
 
   secrets.files.vaultwarden-env = {
     text = ''
-      ADMIN_TOKEN=${tf.variables.vaultwarden-admin-token.ref}
+      ADMIN_TOKEN=${tf.variables.vaultwarden-password.ref}
+      SMTP_HOST=athame.kittywit.ch
+      SMTP_FROM=vaultwarden@kittywit.ch
+      SMTP_FROM_NAME=Vaultwarden
+      SMTP_PORT=465
+      SMTP_SSL=true
+      SMTP_EXPLICIT_TLS=true
+      SMTP_USERNAME=vaultwarden@kittywit.ch
+      SMTP_PASSWORD=${tf.variables.vaultwarden-smtp.ref}
     '';
     owner = "bitwarden_rs";
     group = "bitwarden_rs";