diff --git a/hypha/apply/users/utils.py b/hypha/apply/users/utils.py
index d3553d65537b8d48ddde1b5114741c5b2b2fc3ea..6814b47176771faf8bd3f7b564519b509a35b16e 100644
--- a/hypha/apply/users/utils.py
+++ b/hypha/apply/users/utils.py
@@ -34,12 +34,14 @@ def send_activation_email(user, site=None):
 
     activation_path = reverse('users:activate', kwargs={'uidb64': uid, 'token': token})
 
+    timeout_days = settings.PASSWORD_RESET_TIMEOUT // (24 * 3600)
+
     context = {
         'user': user,
         'name': user.get_full_name(),
         'username': user.get_username(),
         'activation_path': activation_path,
-        'timeout_days': settings.PASSWORD_RESET_TIMEOUT,
+        'timeout_days': timeout_days,
         'org_long_name': settings.ORG_LONG_NAME,
     }
 
@@ -63,13 +65,15 @@ def send_confirmation_email(user, token, updated_email=None, site=None):
 
     activation_path = reverse('users:confirm_email', kwargs={'uidb64': uid, 'token': token})
 
+    timeout_days = settings.PASSWORD_RESET_TIMEOUT // (24 * 3600)
+
     context = {
         'user': user,
         'name': user.get_full_name(),
         'username': user.get_username(),
         'unverified_email': updated_email,
         'activation_path': activation_path,
-        'timeout_days': settings.PASSWORD_RESET_TIMEOUT,
+        'timeout_days': timeout_days,
         'org_long_name': settings.ORG_LONG_NAME,
     }
 
diff --git a/hypha/apply/users/views.py b/hypha/apply/users/views.py
index a258c3f7419029dea8df19e04ae6be8b544bdde1..b5266400ff86d7c0d5244cc89ac27b047a18bd10 100644
--- a/hypha/apply/users/views.py
+++ b/hypha/apply/users/views.py
@@ -199,7 +199,7 @@ class EmailChangeConfirmationView(TemplateView):
         try:
             unsigned_value = signer.unsign(
                 token,
-                max_age=datetime.timedelta(days=settings.PASSWORD_RESET_TIMEOUT)
+                max_age=datetime.timedelta(seconds=settings.PASSWORD_RESET_TIMEOUT)
             )
         except Exception:
             return False