diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74eed733..6488f246 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 - Return the response headers and cookies in the `$http.send()` result ([#3310](https://github.com/pocketbase/pocketbase/discussions/3310)).
 
+- Added more descriptive internal error message for missing user/admin email on password reset requests.
+
 
 ## v0.18.5
 
diff --git a/forms/admin_password_reset_request.go b/forms/admin_password_reset_request.go
index cecdfb69..b0568ae7 100644
--- a/forms/admin_password_reset_request.go
+++ b/forms/admin_password_reset_request.go
@@ -2,6 +2,7 @@ package forms
 
 import (
 	"errors"
+	"fmt"
 	"time"
 
 	validation "github.com/go-ozzo/ozzo-validation/v4"
@@ -66,7 +67,7 @@ func (form *AdminPasswordResetRequest) Submit(interceptors ...InterceptorFunc[*m
 
 	admin, err := form.dao.FindAdminByEmail(form.Email)
 	if err != nil {
-		return err
+		return fmt.Errorf("Failed to fetch admin with email %s: %w", form.Email, err)
 	}
 
 	now := time.Now().UTC()
diff --git a/forms/record_password_reset_request.go b/forms/record_password_reset_request.go
index 286878ed..148059a8 100644
--- a/forms/record_password_reset_request.go
+++ b/forms/record_password_reset_request.go
@@ -2,6 +2,7 @@ package forms
 
 import (
 	"errors"
+	"fmt"
 	"time"
 
 	validation "github.com/go-ozzo/ozzo-validation/v4"
@@ -69,7 +70,7 @@ func (form *RecordPasswordResetRequest) Submit(interceptors ...InterceptorFunc[*
 
 	authRecord, err := form.dao.FindAuthRecordByEmail(form.collection.Id, form.Email)
 	if err != nil {
-		return err
+		return fmt.Errorf("Failed to fetch %s record with email %s: %w", form.collection.Id, form.Email, err)
 	}
 
 	now := time.Now().UTC()