diff --git a/Wave/Services/EmailTemplateService.cs b/Wave/Services/EmailTemplateService.cs
index dd71b3a..94b0f37 100644
--- a/Wave/Services/EmailTemplateService.cs
+++ b/Wave/Services/EmailTemplateService.cs
@@ -15,7 +15,7 @@ public enum Constants {
 	
 	private Regex TokenMatcher { get; } = MyRegex();
 
-	public async Task<(string user, string token)> CreateConfirmTokensAsync(Guid subscriberId, string role = "subscribe") {
+	public async Task<(string user, string token)> CreateConfirmTokensAsync(Guid subscriberId, string role = "subscribe", TimeSpan? expiration = null) {
 		string user = Convert.ToBase64String(subscriberId.ToByteArray());
 		string token = Convert.ToBase64String(Guid.NewGuid().ToByteArray());
 		string cacheKey = role + "-" + user;
@@ -23,7 +23,7 @@ public enum Constants {
 		await TokenCache.SetAsync(cacheKey, 
 			Convert.FromBase64String(token), 
 			new DistributedCacheEntryOptions {
-				AbsoluteExpirationRelativeToNow = TimeSpan.FromDays(1)
+				AbsoluteExpirationRelativeToNow = expiration ?? TimeSpan.FromDays(1)
 			});
 		
 		return (user, token);