diff --git a/src/primaite/game/agent/actions/session.py b/src/primaite/game/agent/actions/session.py
index 58a8a555..b7b56d17 100644
--- a/src/primaite/game/agent/actions/session.py
+++ b/src/primaite/game/agent/actions/session.py
@@ -63,8 +63,6 @@ class NodeSessionsRemoteLoginAction(NodeSessionAbstractAction, discriminator="no
 class NodeSessionsRemoteLogoutAction(NodeSessionAbstractAction, discriminator="node-session-remote-logoff"):
     """Action which performs a remote session logout."""
 
-    config: "NodeSessionsRemoteLogoutAction.ConfigSchema"
-
     class ConfigSchema(NodeSessionAbstractAction.ConfigSchema):
         """Configuration schema for NodeSessionsRemoteLogoutAction."""
 
@@ -78,14 +76,13 @@ class NodeSessionsRemoteLogoutAction(NodeSessionAbstractAction, discriminator="n
         return ["network", "node", config.node_name, "service", "terminal", config.verb, config.remote_ip]
 
 
-class NodeAccountChangePasswordAction(NodeSessionAbstractAction, discriminator="node-account-change-password"):
+class NodeAccountChangePasswordAction(AbstractAction, discriminator="node-account-change-password"):
     """Action which changes the password for a user."""
 
-    config: "NodeAccountChangePasswordAction.ConfigSchema"
-
-    class ConfigSchema(NodeSessionAbstractAction.ConfigSchema):
+    class ConfigSchema(AbstractAction.ConfigSchema):
         """Configuration schema for NodeAccountsChangePasswordAction."""
 
+        node_name: str
         username: str
         current_password: str
         new_password: str