diff --git a/fs_template/reset_confirm.tpl b/fs_template/reset_confirm.tpl
index 51cdd754..239f5f85 100644
--- a/fs_template/reset_confirm.tpl
+++ b/fs_template/reset_confirm.tpl
@@ -117,6 +117,11 @@ button:hover {
 </form>
 </div>
 
+<div id="messageContainer">
+  <p id="successMessage" class="message success"></p>
+  <p id="errorMessage" class="message error"></p>
+</div>
+
 <script>
 function resetPassword() {
   const new_password = document.getElementById("new_password").value;
diff --git a/server/auth/internal/logic/userresetpasswordlogic.go b/server/auth/internal/logic/userresetpasswordlogic.go
index 4416aa8c..2d0d75b6 100644
--- a/server/auth/internal/logic/userresetpasswordlogic.go
+++ b/server/auth/internal/logic/userresetpasswordlogic.go
@@ -56,7 +56,7 @@ func (l *UserResetPasswordLogic) UserResetPassword(req *types.RequestUserResetPa
 
 	err = l.svcCtx.AllModels.FsUser.Transaction(l.ctx, func(tx *gorm.DB) error {
 		user := &gmodel.FsUser{}
-		err := tx.Where("id = ?", user.Id).Take(user).Error
+		err := tx.Model(user).Where("id = ?", rt.UserId).Take(user).Error
 		if err != nil {
 			logx.Error(err)
 			return err