diff --git a/src/primaite/simulator/system/services/database/database_service.py b/src/primaite/simulator/system/services/database/database_service.py
index 91f71302..d65f05bd 100644
--- a/src/primaite/simulator/system/services/database/database_service.py
+++ b/src/primaite/simulator/system/services/database/database_service.py
@@ -54,7 +54,11 @@ class DatabaseService(Service, identifier="DatabaseService"):
         super().__init__(**kwargs)
         self._create_db_file()
         self.backup_server_ip = self.config.backup_server_ip
-        self.password = self.config.db_password
+
+    @property
+    def password(self) -> Optional[str]:
+        """Convenience property for accessing the password."""
+        return self.config.db_password
 
     def install(self):
         """
diff --git a/src/primaite/simulator/system/services/dns/dns_client.py b/src/primaite/simulator/system/services/dns/dns_client.py
index 6e6f7729..f4b427cd 100644
--- a/src/primaite/simulator/system/services/dns/dns_client.py
+++ b/src/primaite/simulator/system/services/dns/dns_client.py
@@ -44,6 +44,11 @@ class DNSClient(Service, identifier="DNSClient"):
         self.dns_server = self.config.dns_server
         self.start()
 
+    @property
+    def dns_server(self) -> Optional[IPV4Address]:
+        """Convenience property for accessing the dns server configuration."""
+        return self.config.dns_server
+
     def describe_state(self) -> Dict:
         """
         Describes the current state of the software.
@@ -179,4 +184,4 @@ class DNSClient(Service, identifier="DNSClient"):
         """Set the DNS server to be the node's DNS server unless a different one was already provided."""
         self.parent: Node
         if self.parent and not self.dns_server:
-            self.dns_server = self.parent.dns_server
+            self.config.dns_server = self.parent.dns_server