diff --git a/hosts/terebralia-sulcata/default.nix b/hosts/terebralia-sulcata/default.nix
index 07f97db..0401a72 100644
--- a/hosts/terebralia-sulcata/default.nix
+++ b/hosts/terebralia-sulcata/default.nix
@@ -23,6 +23,15 @@
 
     settings.ssh.openOutsideVPN = true;
 
+    users.users.snapclient = {
+      description = "The user for that all system audio (snapclient/pipewire) should run";
+      isNormalUser = true;
+      linger = true;
+      openssh.authorizedKeys.keyFiles = [
+        ../../secrets/pub/yubikey.pub
+      ];
+    };
+
     services.avahi = {
       enable = true;
       nssmdns4 = true;
diff --git a/modules/snapclient.nix b/modules/snapclient.nix
index fa32a65..322a22e 100644
--- a/modules/snapclient.nix
+++ b/modules/snapclient.nix
@@ -11,6 +11,7 @@ let cfg = config.services.snapclient; in
   config.systemd.user.services.snapclient = lib.mkIf cfg.enable {
     wantedBy = lib.warnIfNot config.services.pipewire.enable "Pipewire is not running, snapclient won't work" [
       "pipewire.service"
+      "default.target"
     ];
     after = [
       "pipewire.service"