diff --git a/app/views/accounts/registrations/edit.html.erb b/app/views/accounts/registrations/edit.html.erb
index 97146b61..80b26c0a 100644
--- a/app/views/accounts/registrations/edit.html.erb
+++ b/app/views/accounts/registrations/edit.html.erb
@@ -1,7 +1,7 @@
 <h2>Edit <%= params[:type] %> <%#= resource_name.to_s.humanize %></h2>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name, :type => params[:type]), :html => { :method => :put }) do |f| %>
-  <%= devise_error_messages! %>
+  <%= render "devise/shared/error_messages", resource: resource %>
   <% if params[:type] == 'username' %>
     <p><%= f.label :username %><br />
     <%= resource.can_change_username ? f.text_field(:username) : resource.username %>
diff --git a/app/views/accounts/registrations/new.html.erb b/app/views/accounts/registrations/new.html.erb
index 2287cf34..acd560c6 100644
--- a/app/views/accounts/registrations/new.html.erb
+++ b/app/views/accounts/registrations/new.html.erb
@@ -6,7 +6,7 @@
   <li>Access more problems.</li>
 </ul>
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
-  <%= devise_error_messages! %>
+  <%= render "devise/shared/error_messages", resource: resource %>
 
   <div class="field">
     <h3><%= f.label :username %></h3>
diff --git a/app/views/accounts/settings/edit.html.erb b/app/views/accounts/settings/edit.html.erb
index b15ea6cb..33dbb390 100644
--- a/app/views/accounts/settings/edit.html.erb
+++ b/app/views/accounts/settings/edit.html.erb
@@ -2,7 +2,7 @@
 <% toolbox_push :back, :back %>
 
 <%= form_for(resource, :as => resource_name, :url => "/accounts/settings/update", :html => { :multipart => true, :method => :put }) do |f| %>
-  <%= devise_error_messages! %>
+  <%= render "devise/shared/error_messages", resource: resource %>
 
   <div class="field">
     <h3><%= f.label :username %></h3>