1 files changed, 9 insertions, 4 deletions
diff --git a/synapse/storage/databases/main/registration.py b/synapse/storage/databases/main/registration.py
index c439b58db6..d36b18a0e9 100644
--- a/synapse/storage/databases/main/registration.py
+++ b/synapse/storage/databases/main/registration.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2016 OpenMarket Ltd
 # Copyright 2017-2018 New Vector Ltd
 # Copyright 2019,2020 The Matrix.org Foundation C.I.C.
@@ -92,11 +91,17 @@ class RegistrationWorkerStore(CacheInvalidationWorkerStore):
             id_column=None,
         )
 
-        self._account_validity_enabled = hs.config.account_validity_enabled
+        self._account_validity_enabled = (
+            hs.config.account_validity.account_validity_enabled
+        )
+        self._account_validity_period = None
+        self._account_validity_startup_job_max_delta = None
         if self._account_validity_enabled:
-            self._account_validity_period = hs.config.account_validity_period
+            self._account_validity_period = (
+                hs.config.account_validity.account_validity_period
+            )
             self._account_validity_startup_job_max_delta = (
-                hs.config.account_validity_startup_job_max_delta
+                hs.config.account_validity.account_validity_startup_job_max_delta
             )
 
             if hs.config.run_background_tasks: