diff --git a/api/src/main/java/ca/bc/gov/educ/api/edx/service/v1/EdxUsersService.java b/api/src/main/java/ca/bc/gov/educ/api/edx/service/v1/EdxUsersService.java
index 4c0f803a..59e30e72 100644
--- a/api/src/main/java/ca/bc/gov/educ/api/edx/service/v1/EdxUsersService.java
+++ b/api/src/main/java/ca/bc/gov/educ/api/edx/service/v1/EdxUsersService.java
@@ -604,7 +604,7 @@ private EdxUserSchoolEntity createEdxUserSchoolFromActivationCodeDetails(EdxActi
     EdxUserSchoolEntity userSchoolEntity = new EdxUserSchoolEntity();
     userSchoolEntity.setEdxUserEntity(edxUser);
     userSchoolEntity.setSchoolID(activationCode.getSchoolID());
-    userSchoolEntity.setExpiryDate(activationCode.getExpiryDate());
+    userSchoolEntity.setExpiryDate(activationCode.getEdxUserExpiryDate());
     updateAuditColumnsForEdxUserSchoolEntity(edxActivateUser, userSchoolEntity);
     return userSchoolEntity;
   }
@@ -613,7 +613,7 @@ private EdxUserDistrictEntity createEdxUserDistrictFromActivationCodeDetails(Edx
     EdxUserDistrictEntity userDistrictEntity = new EdxUserDistrictEntity();
     userDistrictEntity.setEdxUserEntity(edxUser);
     userDistrictEntity.setDistrictID(activationCode.getDistrictID());
-    userDistrictEntity.setExpiryDate(activationCode.getExpiryDate());
+    userDistrictEntity.setExpiryDate(activationCode.getEdxUserExpiryDate());
     updateAuditColumnsForEdxUserDistrictEntity(edxActivateUser, userDistrictEntity);
     return userDistrictEntity;
   }