diff --git a/systems/gateway/default.nix b/systems/gateway/default.nix
index ad372ca..29b2459 100644
--- a/systems/gateway/default.nix
+++ b/systems/gateway/default.nix
@@ -10,9 +10,12 @@ in {
 
   services.openssh.enable = true;
   services.openssh.ports = [ 422 ];
+  services.openssh.extraConfig = activeUsers;
   users.users = lib.mapAttrs (name: userList: {
-    openssh.authorizedKeys.keys = lib.unique (map (u: u.pubssh) userList);
-  }) activeUsers
+    openssh.authorizedKeys.keys = lib.unique (
+      lib.concatMap (u: if u ? pubssh then [ u.pubssh ] else []) userList
+    );
+  }) groupedUsers
   // {
     root = {openssh.authorizedKeys.keys = [];};
   };