diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 00f47cbc5..e4d9c3688 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -5,7 +5,6 @@
     = bootstrap_form_for(resource, as: resource_name,
         url: session_path(resource_name),
         html: { class: "text-center border border-light p-5" }) do |f|
-      = devise_error_messages!
       = f.text_field :login, label: 'Login', required: true
       = f.password_field :password, type: "password"
       - if devise_mapping.rememberable?
diff --git a/app/views/devise/shared/_error_messages.html.haml b/app/views/devise/shared/_error_messages.html.haml
new file mode 100644
index 000000000..a921fd612
--- /dev/null
+++ b/app/views/devise/shared/_error_messages.html.haml
@@ -0,0 +1,9 @@
+- if resource.errors.any?
+  #error_explanation
+    %h2
+      = I18n.t("errors.messages.not_saved",                 |
+        count: resource.errors.count,                       |
+        resource: resource.class.model_name.human.downcase) |
+    %ul
+      - resource.errors.full_messages.each do |message|
+        %li= message