diff --git a/app/controllers/shopkeeper_auth/passwords_controller.rb b/app/controllers/shopkeeper_auth/passwords_controller.rb
index 4859a6b..b9e84c0 100644
--- a/app/controllers/shopkeeper_auth/passwords_controller.rb
+++ b/app/controllers/shopkeeper_auth/passwords_controller.rb
@@ -18,7 +18,7 @@ def render_error_not_allowed_redirect_url
   end
 
   def render_not_found_error
-    render json: {code: 404, error_message: I18n.t("devise_token_auth.passwords.user_not_found", email: @email)}, status: :not_found
+    render json: {success: true, message: I18n.t("devise_token_auth.passwords.sended_paranoid")}, status: :ok
   end
 
   def render_create_error(errors)
@@ -48,13 +48,11 @@ def render_update_error_missing_password
   end
 
   def render_update_error
-    error_messages = @resource.errors.full_messages.flatten.join("<br/>").html_safe
-
     redirect_to(
       edit_shopkeeper_auth_reset_password_path(
         reset_password_token: params[:reset_password_token]
       ),
-      alert: error_messages
+      alert: @resource.errors.full_messages.to_sentence
     )
   end
 end
diff --git a/config/initializers/devise_token_auth.rb b/config/initializers/devise_token_auth.rb
index 24e0bce..100332d 100644
--- a/config/initializers/devise_token_auth.rb
+++ b/config/initializers/devise_token_auth.rb
@@ -35,7 +35,7 @@
   # Uncomment to enforce current_password param to be checked before all
   # attribute updates. Set it to :password if you want it to be checked only if
   # password is updated.
-  # config.check_current_password_before_update = :attributes
+  config.check_current_password_before_update = :password
 
   # By default we will use callbacks for single omniauth.
   # It depends on fields like email, provider and uid.
diff --git a/test/controllers/shopkeeper_auth/passwords_controller_test.rb b/test/controllers/shopkeeper_auth/passwords_controller_test.rb
index 339763a..33e38ff 100644
--- a/test/controllers/shopkeeper_auth/passwords_controller_test.rb
+++ b/test/controllers/shopkeeper_auth/passwords_controller_test.rb
@@ -35,7 +35,23 @@ def setup
     assert_equal 401, JSON.parse(response.body)["code"]
   end
 
-  test "should return not found for non-existent email" do
+  test "should redirect with error when password update fails validation" do
+    token = @shopkeeper.send(:set_reset_password_token)
+
+    patch shopkeeper_password_url,
+      params: {
+        reset_password_token: token,
+        password: "short",
+        password_confirmation: "mismatch"
+      }
+
+    assert_response :redirect
+    assert_match "edit", response.location
+    follow_redirect!
+    assert_select ".bg-yellow-50"
+  end
+
+  test "should return generic success for non-existent email to prevent enumeration" do
     post shopkeeper_password_url,
       params: {
         email: "nonexistent@example.com",
@@ -43,7 +59,7 @@ def setup
       },
       as: :json
 
-    assert_response :not_found
-    assert_equal 404, JSON.parse(response.body)["code"]
+    assert_response :ok
+    assert JSON.parse(response.body)["success"]
   end
 end