diff --git a/flake.nix b/flake.nix
index 28e508c..3689369 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,5 @@
 {
   # TODO: check whether there is no TODOs
-  # TODO: check whether there is no hedgegdoc mentions
   description = "Mastodon module";
 
   outputs = { ... }:
diff --git a/module.nix b/module.nix
index 49c9d65..a9f37ed 100644
--- a/module.nix
+++ b/module.nix
@@ -114,7 +114,7 @@ in
       };
     };
 
-    selfprivacy.emails."noreply.mastodon" = {
+    selfprivacy.emails."noreplymastodon" = {
       hashedPasswordFile = secrets.hashedPasswordFile;
       systemdTargets = [ "mastodon-email-password-setup.service" ];
       sendOnly = true;
@@ -125,6 +125,7 @@ in
         enable = true;
         wantedBy = [ "multi-user.target" "mastodon-web.service" "postfix.service" ];
         serviceConfig = {
+          Slice = "mastodon.slice";
           Type = "oneshot";
           ExecStart = pkgs.writeShellScript "gen-mastodon-email-password" ''
             export password=$(head -c 32 /dev/urandom | base64 | sed 's/[+=\\/A-Z]//g')
@@ -184,7 +185,7 @@ in
       services.mastodon-web = {
         unitConfig.RequiresMountsFor = lib.mkIf sp.useBinds "/volumes/${cfg.location}/mastodon";
         serviceConfig = {
-          Slice = "hedgedoc.slice";
+          Slice = "mastodon.slice";
           LoadCredential = ["client-secret:${oauthClientSecretFP}"];
           ExecStart = lib.mkForce (pkgs.writeShellScript "run-mastodon-with-client-secret" ''
             export OIDC_CLIENT_SECRET=$(cat $CREDENTIALS_DIRECTORY/client-secret)