diff --git a/flake.lock b/flake.lock
index c984753..53ddd1a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -188,11 +188,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1764948094,
-        "narHash": "sha256-66yY6CKIS25j7cTee6026EhVKO+pYbnNgPfs0G5zTeI=",
+        "lastModified": 1765897479,
+        "narHash": "sha256-0F5UW4sb3wKd9TwDoEvEGEb+eFov92jOERRpDN7n6bM=",
         "ref": "refs/heads/master",
-        "rev": "92745016fdc46be533e390743af7dc91ca322ec8",
-        "revCount": 158,
+        "rev": "0b68766f3340049baa1e01418b92905cad8888a1",
+        "revCount": 161,
         "type": "git",
         "url": "ssh://git@github.com/TheWanderingCrow/nix-secrets"
       },
diff --git a/modules/services/forgejo/default.nix b/modules/services/forgejo/default.nix
index 408a830..f42b391 100644
--- a/modules/services/forgejo/default.nix
+++ b/modules/services/forgejo/default.nix
@@ -8,16 +8,16 @@ in
   '';
 
   sops.secrets = {
-    "forgejo/mailer/server" = {
+    "generic/smtp/server" = {
       sopsFile = "${sopsFolder}/services.yaml";
     };
-    "forgejo/mailer/port" = {
+    "generic/smtp/port" = {
       sopsFile = "${sopsFolder}/services.yaml";
     };
-    "forgejo/mailer/user" = {
+    "generic/smtp/user" = {
       sopsFile = "${sopsFolder}/services.yaml";
     };
-    "forgejo/mailer/pass" = {
+    "generic/smtp/pass" = {
       sopsFile = "${sopsFolder}/services.yaml";
     };
   };
@@ -53,10 +53,10 @@ in
     };
     secrets = {
       mailer = {
-        SMTP_ADDR = config.sops.secrets."forgejo/mailer/server".path;
-        SMTP_PORT = config.sops.secrets."forgejo/mailer/port".path;
-        USER = config.sops.secrets."forgejo/mailer/user".path;
-        PASSWD = config.sops.secrets."forgejo/mailer/pass".path;
+        SMTP_ADDR = config.sops.secrets."generic/smtp/server".path;
+        SMTP_PORT = config.sops.secrets."generic/smtp/port".path;
+        USER = config.sops.secrets."generic/smtp/user".path;
+        PASSWD = config.sops.secrets."generic/smtp/pass".path;
       };
     };
   };
diff --git a/modules/services/lubelogger/default.nix b/modules/services/lubelogger/default.nix
index 1364bc6..4ed8cd2 100644
--- a/modules/services/lubelogger/default.nix
+++ b/modules/services/lubelogger/default.nix
@@ -27,36 +27,36 @@ in
       "lubelogger/pass_hash" = {
         sopsFile = "${sopsFolder}/services.yaml";
       };
-      "lubelogger/mailer/server" = {
-        sopsFile = "${sopsFolder}/services.yaml";
-      };
-      "lubelogger/mailer/port" = {
-        sopsFile = "${sopsFolder}/services.yaml";
-      };
-      "lubelogger/mailer/user" = {
-        sopsFile = "${sopsFolder}/services.yaml";
-      };
-      "lubelogger/mailer/pass" = {
-        sopsFile = "${sopsFolder}/services.yaml";
-      };
       "lubelogger/oidc/id" = {
         sopsFile = "${sopsFolder}/services.yaml";
       };
       "lubelogger/oidc/secret" = {
         sopsFile = "${sopsFolder}/services.yaml";
       };
+      "generic/smtp/server" = {
+        sopsFile = "${sopsFolder}/services.yaml";
+      };
+      "generic/smtp/port" = {
+        sopsFile = "${sopsFolder}/services.yaml";
+      };
+      "generic/smtp/user" = {
+        sopsFile = "${sopsFolder}/services.yaml";
+      };
+      "generic/smtp/pass" = {
+        sopsFile = "${sopsFolder}/services.yaml";
+      };
     };
     templates."lubelogger-env".content = ''
       LC_ALL=en_US.UTF-8
       LANG=en_US.UTF-8
-      MailConfig__EmailServer="${config.sops.placeholder."lubelogger/mailer/server"}"
-      MailConfig__EmailFrom="${config.sops.placeholder."lubelogger/mailer/user"}"
-      MailConfig__Port=587
-      MailConfig__Username="${config.sops.placeholder."lubelogger/mailer/user"}"
-      MailConfig__Password="${config.sops.placeholder."lubelogger/mailer/pass"}"
-      UserNameHash="82d405081840957b2b1a62719d81291e2301d100a477a03ba0a8a152e58ac2ad"
-      UserPasswordHash="${config.sops.placeholder."lubelogger/pass_hash"}"
+      UserNameHash=${config.sops.placeholder."lubelogger/user_hash"}
+      UserPasswordHash=${config.sops.placeholder."lubelogger/pass_hash"}
       LUBELOGGER_CUSTOM_WIDGETS=true
+      MailConfig__EmailServer=${config.sops.placeholder."generic/smtp/server"}
+      MailConfig__EmailFrom=${config.sops.placeholder."generic/smtp/user"}
+      MailConfig__Port=${config.sops.placeholder."generic/smtp/port"}
+      MailConfig__Username=${config.sops.placeholder."generic/smtp/user"}
+      MailConfig__Password=${config.sops.placeholder."generic/smtp/pass"}
       OpenIDConfig__Name=Pocket ID
       OpenIDConfig__ClientId=${config.sops.placeholder."lubelogger/oidc/id"}
       OpenIDConfig__ClientSecret=${config.sops.placeholder."lubelogger/oidc/secret"}
@@ -65,9 +65,8 @@ in
       OpenIDConfig__TokenURL=https://auth.wanderingcrow.net/api/oidc/token
       OpenIDConfig__Scope=openid email
       OpenIDConfig__UsePKCE=true
-      OpenIDConfig__DisableRegularLogin=true
+      OpenIDConfig__DisableRegularLogin=false
       OpenIDConfig__LogOutURL=https://auth.wanderingcrow.net/api/oidc/end-session
-      EnableRootUserOIDC=true
     '';
 
   };