diff --git a/Gemfile b/Gemfile
index 03157827c..2e6eb08ab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,7 @@ gem "json-schema", "2.8.1"
 
 # Authentication
 
-gem "devise", "4.5.0"
+gem "devise", "4.6.1"
 gem "devise_lastseenable", "0.0.6"
 
 # Captcha
diff --git a/Gemfile.lock b/Gemfile.lock
index 20b0b6c0d..65e2e7a09 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -163,7 +163,7 @@ GEM
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
     database_cleaner (1.7.0)
-    devise (4.5.0)
+    devise (4.6.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 6.0)
@@ -780,7 +780,7 @@ DEPENDENCIES
   cucumber-api-steps (= 0.14)
   cucumber-rails (= 1.6.0)
   database_cleaner (= 1.7.0)
-  devise (= 4.5.0)
+  devise (= 4.6.1)
   devise_lastseenable (= 0.0.6)
   diaspora-prosody-config (= 0.0.7)
   diaspora_federation-json_schema (= 0.2.5)
diff --git a/app/views/devise/confirmations/new.html.haml b/app/views/devise/confirmations/new.html.haml
index 04965f756..b1a4555d8 100644
--- a/app/views/devise/confirmations/new.html.haml
+++ b/app/views/devise/confirmations/new.html.haml
@@ -1,10 +1,10 @@
 %h2 Resend confirmation instructions
 = form_for(resource, :as => resource_name, :url => confirmation_path(resource_name)) do |f|
-  = devise_error_messages!
+  = render partial: "devise/shared/error_messages"
   %p
     = f.label :email
     %br/
     = f.text_field :email
   %p
   = f.submit t('.resend_confirmation')
-= render :partial => "devise/shared/links"
+= render partial: "devise/shared/links"
diff --git a/app/views/devise/passwords/edit.mobile.haml b/app/views/devise/passwords/edit.mobile.haml
index a9d7df344..b3d758b12 100644
--- a/app/views/devise/passwords/edit.mobile.haml
+++ b/app/views/devise/passwords/edit.mobile.haml
@@ -6,7 +6,7 @@
   .login-form
     .login-container
       = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
-        = devise_error_messages!
+        = render partial: "devise/shared/error_messages", formats: [:html]
         = f.hidden_field :reset_password_token
         %fieldset
           %legend
diff --git a/app/views/devise/passwords/new.haml b/app/views/devise/passwords/new.haml
index 627aa3a1d..9a5683b63 100644
--- a/app/views/devise/passwords/new.haml
+++ b/app/views/devise/passwords/new.haml
@@ -9,7 +9,7 @@
         = AppConfig.settings.pod_name
 
     = form_for(resource, as: resource_name, url: password_path(resource_name), html: {class: "form-horizontal block-form"}, autocomplete: 'off') do |f|
-      - if !devise_error_messages!.empty?
+      - unless resource.errors.empty?
         %legend
           %i
             = t('devise.passwords.new.no_account') # this is an error message and should not be displayed as a legend
diff --git a/app/views/devise/passwords/new.mobile.haml b/app/views/devise/passwords/new.mobile.haml
index af496b0bf..63bcedfd8 100644
--- a/app/views/devise/passwords/new.mobile.haml
+++ b/app/views/devise/passwords/new.mobile.haml
@@ -9,7 +9,7 @@
         %fieldset
           %legend
             =t('devise.passwords.new.forgot_password')
-          - unless devise_error_messages!.empty?
+          - unless resource.errors.empty?
             %i=  t('devise.passwords.new.no_account')
 
           .control-group
diff --git a/app/views/devise/unlocks/new.html.haml b/app/views/devise/unlocks/new.html.haml
index 6fff589eb..d3f1d629d 100644
--- a/app/views/devise/unlocks/new.html.haml
+++ b/app/views/devise/unlocks/new.html.haml
@@ -1,10 +1,10 @@
 %h2 Resend unlock instructions
 = form_for(resource, :as => resource_name, :url => unlock_path(resource_name)) do |f|
-  = devise_error_messages!
+  = render partial: "devise/shared/error_messages"
   %p
     = f.label :email
     %br/
     = f.text_field :email
   %p
   = f.submit t('.resend_unlock')
-= render :partial => "devise/shared/links"
+= render partial: "devise/shared/links"