diff --git a/config/envs/default.py b/config/envs/default.py
index 2ba0b4c0..672a1aa6 100644
--- a/config/envs/default.py
+++ b/config/envs/default.py
@@ -135,8 +135,7 @@ class DefaultConfig(object):
     """
     Magic Links
     """
-    MAGIC_LINK_EXPIRY_DAYS = 1
-    MAGIC_LINK_EXPIRY_SECONDS = 86400 * MAGIC_LINK_EXPIRY_DAYS
+    MAGIC_LINK_EXPIRY_SECONDS = 60 * 60  # last for an hour
     MAGIC_LINK_RECORD_PREFIX = "link"
     MAGIC_LINK_USER_PREFIX = "account"
     MAGIC_LINK_LANDING_PAGE = "/service/magic-links/landing/"
diff --git a/models/magic_link.py b/models/magic_link.py
index e7e89aa1..83ebed20 100644
--- a/models/magic_link.py
+++ b/models/magic_link.py
@@ -103,8 +103,7 @@ def _make_link_json(account: Account, redirect_url: str):
                 (
                     datetime.now()
                     + timedelta(
-                        days=Config.MAGIC_LINK_EXPIRY_DAYS,
-                        minutes=1,
+                        seconds=Config.MAGIC_LINK_EXPIRY_SECONDS + 60,
                     )
                 ).timestamp()
             ),
@@ -131,6 +130,7 @@ def _set_unique_keyed_record(self, value: str, prefix=None, max_tries: int = 6)
             )
             if created:
                 return prefixed_key, unique_key
+        return None
 
     @staticmethod
     def get_user_record_key(account_id: str):
@@ -189,7 +189,9 @@ def create_magic_link(
         :return:
         """
         current_app.logger.info(f"Creating magic link for {account}")
-        self.clear_existing_user_record(account.id)
+
+        # Don't clear unused magic links when a new one is made - for e2e tests sake 🙃
+        # self.clear_existing_user_record(account.id)
 
         if not redirect_url:
             redirect_url = urljoin(