diff --git a/Core/Http/HttpClientAdapter.cs b/Core/Http/HttpClientAdapter.cs
index 39b9c85..8a0905f 100644
--- a/Core/Http/HttpClientAdapter.cs
+++ b/Core/Http/HttpClientAdapter.cs
@@ -137,19 +137,23 @@ private async Task<HttpResponseMessage> ExecuteHttpMethod(Func<Task<HttpResponse
 
             var response = task.Result;
 
-            try
+            if (response.IsSuccessStatusCode)
             {
-                response.EnsureSuccessStatusCode();
                 return response;
             }
-            catch (HttpRequestException ex)
-            {
-                var content = await HttpClientUtils.TryGetContent(response);
-                _logger.Error(ex, "An error occurred while accessing the source. Content: {content:l}. Exception message: {message:l}", content, ex.Message);
 
-                if (response.StatusCode == HttpStatusCode.Unauthorized) throw new UnauthorizedException();
-                throw;
-            }
+            // We don't call EnsureSuccessStatusCode here because it disposes Content
+            // before throwing, which prevents us from reading the body for the log
+            var content = await HttpClientUtils.TryGetContent(response);
+            _logger.Error("An error occurred while accessing the source. Status: {status}. Content: {content:l}",
+                (int)response.StatusCode, content);
+
+            response.Content?.Dispose();
+
+            if (response.StatusCode == HttpStatusCode.Unauthorized) throw new UnauthorizedException();
+
+            throw new HttpRequestException(
+                $"Response status code does not indicate success: {(int)response.StatusCode} ({response.ReasonPhrase}).");
         }
     }
 }
diff --git a/Extensions/SafeHttpContextAccessorExtensions.cs b/Extensions/SafeHttpContextAccessorExtensions.cs
index 8b9289d..b038c0d 100644
--- a/Extensions/SafeHttpContextAccessorExtensions.cs
+++ b/Extensions/SafeHttpContextAccessorExtensions.cs
@@ -1,3 +1,4 @@
+using System;
 using MultiFactor.SelfService.Windows.Portal.Core.Http;
 using MultiFactor.SelfService.Windows.Portal.Integrations.Ldap.CredentialVerification;
 using MultiFactor.SelfService.Windows.Portal.Core.LdapAttributesCaching;
@@ -19,6 +20,16 @@ public static CredentialVerificationResult SafeGetCredVerificationResult(this Sa
                 ?? CredentialVerificationResult.CreateBuilder(false).Build();
         }
 
+        public static void SafeSetCredVerificationResult(this SafeHttpContextAccessor accessor, CredentialVerificationResult result)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            accessor.HttpContext.Items[Constants.CredentialVerificationResult] = result;
+        }
+
         public static ILdapAttributesCache SafeGetLdapAttributes(this SafeHttpContextAccessor accessor)
         {
             return accessor.HttpContext.Items[Constants.LoadedLdapAttributes] as ILdapAttributesCache
diff --git a/Integrations/MultifactorIdpApi/MultifactorIdpApi.cs b/Integrations/MultifactorIdpApi/MultifactorIdpApi.cs
index fe524c1..343f4da 100644
--- a/Integrations/MultifactorIdpApi/MultifactorIdpApi.cs
+++ b/Integrations/MultifactorIdpApi/MultifactorIdpApi.cs
@@ -3,6 +3,7 @@
 using MultiFactor.SelfService.Windows.Portal.Integrations.MultiFactorApi.Dto;
 using MultiFactor.SelfService.Windows.Portal.Integrations.MultiFactorApi.Exceptions;
 using MultiFactor.SelfService.Windows.Portal.Integrations.MultiFactorIdpApi.Dto;
+using Serilog;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
@@ -50,6 +51,7 @@ public async Task<LoginResponseDto> LoginAsync(LoginRequestDto request, Dictiona
             }
             catch (Exception ex)
             {
+                Log.Logger.Error(ex, "IDP LoginAsync failed");
                 return LoginResponseDto.Failed(ex.Message);
             }
         }
@@ -81,6 +83,7 @@ public async Task<IdentityResponseDto> IdentityAsync(IdentityRequestDto request,
             }
             catch (Exception ex)
             {
+                Log.Logger.Error(ex, "IDP IdentityAsync failed");
                 return IdentityResponseDto.Failed(ex.Message);
             }
         }
diff --git a/MultiFactor.SelfService.Windows.Portal.csproj b/MultiFactor.SelfService.Windows.Portal.csproj
index ba310ad..4401db1 100644
--- a/MultiFactor.SelfService.Windows.Portal.csproj
+++ b/MultiFactor.SelfService.Windows.Portal.csproj
@@ -642,6 +642,7 @@
     <Content Include="Views\Account\Authn.cshtml" />
     <Content Include="Views\Account\Identity.cshtml" />
     <Content Include="Views\Error\AccessDenied.cshtml" />
+    <Content Include="Views\Error\SessionExpired.cshtml" />
     <Content Include="Views\Unlock\Success.cshtml" />
     <Content Include="Views\Unlock\Wrong.cshtml" />
     <Content Include="Web.config" />
diff --git a/Services/TokenValidationService.cs b/Services/TokenValidationService.cs
index dc83ae8..29f7528 100644
--- a/Services/TokenValidationService.cs
+++ b/Services/TokenValidationService.cs
@@ -4,6 +4,7 @@
 using MultiFactor.SelfService.Windows.Portal.Services.API;
 using Serilog;
 using System;
+using System.Globalization;
 using System.IdentityModel.Tokens.Jwt;
 using System.Linq;
 using System.Net;
@@ -81,7 +82,14 @@ public bool VerifyToken(string jwt, out Token token)
                         claim.Type == MultiFactorClaims.PasswordExpirationDate);
                 if (_configuration.NotifyOnPasswordExpirationDaysLeft > 0 && passwordExpirationDate?.Value != null)
                 {
-                    token.PasswordExpirationDate = DateTime.Parse(passwordExpirationDate.Value);
+                    if (DateTime.TryParse(passwordExpirationDate.Value, CultureInfo.InvariantCulture, DateTimeStyles.None, out var parsed))
+                    {
+                        token.PasswordExpirationDate = parsed;
+                    }
+                    else
+                    {
+                        _logger.Warning("Failed to parse passwordExpirationDate claim value '{Value}'", passwordExpirationDate.Value);
+                    }
                 }
 
                 return true; //token valid
diff --git a/Stories/SignIn/ClaimsSources/MultiFactorClaimsSource.cs b/Stories/SignIn/ClaimsSources/MultiFactorClaimsSource.cs
index c859e9a..ff9cd99 100644
--- a/Stories/SignIn/ClaimsSources/MultiFactorClaimsSource.cs
+++ b/Stories/SignIn/ClaimsSources/MultiFactorClaimsSource.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using MultiFactor.SelfService.Windows.Portal.Core.Authentication.AuthenticationClaims;
@@ -30,8 +31,13 @@ public IReadOnlyDictionary<string, string> GetClaims()
                 return claims;
             }
 
-            claims.Add(MultiFactorClaims.PasswordExpirationDate,
-                result.PasswordExpirationDate.ToString(CultureInfo.InvariantCulture));
+
+            if (result.PasswordExpirationDate > DateTime.MinValue
+                && result.PasswordExpirationDate < DateTime.MaxValue)
+            {
+                claims.Add(MultiFactorClaims.PasswordExpirationDate,
+                    result.PasswordExpirationDate.ToString(CultureInfo.InvariantCulture));
+            }
 
             return claims;
         }
diff --git a/Stories/SignIn/IdentityStory.cs b/Stories/SignIn/IdentityStory.cs
index bc7dffd..40c22bf 100644
--- a/Stories/SignIn/IdentityStory.cs
+++ b/Stories/SignIn/IdentityStory.cs
@@ -92,6 +92,8 @@ public async Task<ActionResult> ExecuteAsync(IdentityModel model, Dictionary<str
 
                 _logger.Information("User '{User}' membership verified successfully", username);
                 verifiedMembership = MapToVerifiedMembershipDto(membershipResult);
+
+                _contextAccessor.SafeSetCredVerificationResult(membershipResult);
             }
 
             var authenticators = await _multifactorApiClient.GetUserAuthenticatorsAsync(username);
diff --git a/Stories/SignIn/SignInStory.cs b/Stories/SignIn/SignInStory.cs
index 32fcc02..694f812 100644
--- a/Stories/SignIn/SignInStory.cs
+++ b/Stories/SignIn/SignInStory.cs
@@ -92,6 +92,8 @@ public async Task<ActionResult> ExecuteAsync(LoginModel model, Dictionary<string
 
         _logger.Information("User '{User}' credentials verified successfully", username);
 
+        _contextAccessor.SafeSetCredVerificationResult(credentialResult);
+
         var claims = _claimsProvider.GetClaims().ToDictionary(x => x.Key, x => x.Value);
         claims.Add(AuthenticationClaims.AUTHENTICATION_METHODS_REFERENCES, AuthenticationClaims.PASSWORD_METHOD);