diff --git a/src/main/java/io/fusionauth/domain/TenantPhoneConfiguration.java b/src/main/java/io/fusionauth/domain/TenantPhoneConfiguration.java
index def6f3ca..ea38be5d 100644
--- a/src/main/java/io/fusionauth/domain/TenantPhoneConfiguration.java
+++ b/src/main/java/io/fusionauth/domain/TenantPhoneConfiguration.java
@@ -26,6 +26,8 @@
  * @author Brady Wied
  */
 public class TenantPhoneConfiguration implements Buildable<TenantPhoneConfiguration> {
+  public UUID forgotPasswordTemplateId;
+
   public UUID messengerId;
 
   public UUID passwordlessTemplateId;
@@ -46,6 +48,7 @@ public TenantPhoneConfiguration() {
 
   public TenantPhoneConfiguration(TenantPhoneConfiguration other) {
     messengerId = other.messengerId;
+    forgotPasswordTemplateId = other.forgotPasswordTemplateId;
     passwordlessTemplateId = other.passwordlessTemplateId;
     unverified = new PhoneUnverifiedOptions(other.unverified);
     verificationCompleteTemplateId = other.verificationCompleteTemplateId;
@@ -64,6 +67,7 @@ public boolean equals(Object o) {
     }
     TenantPhoneConfiguration that = (TenantPhoneConfiguration) o;
     return Objects.equals(messengerId, that.messengerId) &&
+           Objects.equals(forgotPasswordTemplateId, that.forgotPasswordTemplateId) &&
            Objects.equals(passwordlessTemplateId, that.passwordlessTemplateId) &&
            Objects.equals(unverified, that.unverified) &&
            Objects.equals(verificationCompleteTemplateId, that.verificationCompleteTemplateId) &&
@@ -74,6 +78,6 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(messengerId, passwordlessTemplateId, unverified, verificationCompleteTemplateId, verificationStrategy, verificationTemplateId, verifyPhoneNumber);
+    return Objects.hash(messengerId, forgotPasswordTemplateId, unverified, verificationCompleteTemplateId, verificationStrategy, verificationTemplateId, verifyPhoneNumber);
   }
 }
diff --git a/src/main/java/io/fusionauth/domain/api/user/ChangePasswordRequest.java b/src/main/java/io/fusionauth/domain/api/user/ChangePasswordRequest.java
index 8da4de9b..71e25d8c 100644
--- a/src/main/java/io/fusionauth/domain/api/user/ChangePasswordRequest.java
+++ b/src/main/java/io/fusionauth/domain/api/user/ChangePasswordRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, FusionAuth, All Rights Reserved
+ * Copyright (c) 2018-2025, FusionAuth, All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package io.fusionauth.domain.api.user;
 
+import java.util.List;
 import java.util.UUID;
 
 import com.inversoft.json.JacksonConstructor;
@@ -35,6 +36,8 @@ public class ChangePasswordRequest extends BaseEventRequest implements Buildable
 
   public String loginId;
 
+  public List<String> loginIdTypes;
+
   public String password;
 
   public String refreshToken;
diff --git a/src/main/java/io/fusionauth/domain/api/user/ForgotPasswordRequest.java b/src/main/java/io/fusionauth/domain/api/user/ForgotPasswordRequest.java
index cf0fd7d0..7ab63b2c 100644
--- a/src/main/java/io/fusionauth/domain/api/user/ForgotPasswordRequest.java
+++ b/src/main/java/io/fusionauth/domain/api/user/ForgotPasswordRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, FusionAuth, All Rights Reserved
+ * Copyright (c) 2018-2025, FusionAuth, All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package io.fusionauth.domain.api.user;
 
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -35,8 +36,13 @@ public class ForgotPasswordRequest extends BaseEventRequest {
 
   public String loginId;
 
+  public List<String> loginIdTypes;
+
+  @Deprecated
   public boolean sendForgotPasswordEmail = true;
 
+  public Boolean sendForgotPasswordMessage;
+
   public Map<String, Object> state;
 
   @JacksonConstructor
@@ -57,9 +63,9 @@ public ForgotPasswordRequest(UUID applicationId, String loginId) {
     this.loginId = loginId;
   }
 
-  public ForgotPasswordRequest(String loginId, boolean sendForgotPasswordEmail) {
+  public ForgotPasswordRequest(String loginId, boolean sendForgotPasswordMessage) {
     this.loginId = loginId;
-    this.sendForgotPasswordEmail = sendForgotPasswordEmail;
+    this.sendForgotPasswordMessage = sendForgotPasswordMessage;
   }
 
   public ForgotPasswordRequest(EventInfo eventInfo, UUID applicationId, String loginId) {