diff --git a/app/views/users/confirmations/new.html.erb b/app/views/users/confirmations/new.html.erb
index 6c56ff062..16650b5ec 100644
--- a/app/views/users/confirmations/new.html.erb
+++ b/app/views/users/confirmations/new.html.erb
@@ -16,7 +16,7 @@
     </div>
   <% end %>
 
-  <%= render "devise/shared/links" %>
+  <%= render "users/shared/links" %>
 </div>
 
 
diff --git a/app/views/users/passwords/edit.html.erb b/app/views/users/passwords/edit.html.erb
index 3b36aca76..da865940f 100644
--- a/app/views/users/passwords/edit.html.erb
+++ b/app/views/users/passwords/edit.html.erb
@@ -31,5 +31,5 @@
     </div>
   <% end %>
 
-  <%= render "devise/shared/links" %>
+  <%= render "users/shared/links" %>
 </div>
diff --git a/app/views/users/passwords/new.html.erb b/app/views/users/passwords/new.html.erb
index cfd228269..15bb2ab09 100644
--- a/app/views/users/passwords/new.html.erb
+++ b/app/views/users/passwords/new.html.erb
@@ -21,5 +21,5 @@
     </div>
   <% end %>
 
-  <%= render "devise/shared/links" %>
+  <%= render "users/shared/links" %>
 </div>
diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb
index 36c72b8df..a7af0326e 100644
--- a/app/views/users/registrations/new.html.erb
+++ b/app/views/users/registrations/new.html.erb
@@ -45,7 +45,7 @@
     </div>
   <% end %>
 
-  <%= render "devise/shared/links" %>
+  <%= render "users/shared/links" %>
 </div>
 
 <% if resource and not resource.errors.empty? %>
diff --git a/app/views/users/sessions/new.html.erb b/app/views/users/sessions/new.html.erb
index f0f7f0c0e..6c5ac4936 100644
--- a/app/views/users/sessions/new.html.erb
+++ b/app/views/users/sessions/new.html.erb
@@ -30,5 +30,5 @@
     </div>
   <% end %>
 
-  <%= render "devise/shared/links" %>
+  <%= render "users/shared/links" %>
 </div>
diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb
index 130dad09f..d8522b96a 100644
--- a/app/views/users/shared/_links.html.erb
+++ b/app/views/users/shared/_links.html.erb
@@ -10,7 +10,7 @@
   <%= link_to t("devise.links.forgot"), new_password_path(resource_name) %><br />
 <% end -%>
 
-<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+<%- if Rails.configuration.x.enable_email_confirmations && devise_mapping.confirmable? && controller_name != 'confirmations' %>
   <%= link_to t("devise.links.not_receive_confirmation"), new_confirmation_path(resource_name) %><br />
 <% end -%>
 
diff --git a/app/views/users/unlocks/new.html.erb b/app/views/users/unlocks/new.html.erb
index 1418ab7f8..14b5b313e 100644
--- a/app/views/users/unlocks/new.html.erb
+++ b/app/views/users/unlocks/new.html.erb
@@ -21,5 +21,5 @@
     </div>
   <% end %>
 
-  <%= render "devise/shared/links" %>
+  <%= render "users/shared/links" %>
 </div>