diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml
index a5d31c2..9f1e3dc 100644
--- a/app/views/account/login.rhtml
+++ b/app/views/account/login.rhtml
@@ -12,7 +12,13 @@
 <p><center><input type="submit" name="login" value="<%=l(:button_login)%> &#187;" class="primary" /></center>
 <% end %>
 
-<br><% if Setting.self_registration? %><%= link_to l(:label_register), :action => 'register' %> |<% end %>
-<%= link_to l(:label_password_lost), :action => 'lost_password' %></p>
+<br>
+<% links = []
+   links << link_to(l(:label_register), :action => 'register') if Setting.self_registration?
+   links << link_to(l(:label_password_lost), :action => 'password_lost') if Setting.password_lost?
+%>
+<%= links.join(" | ") %>
+</p>
+
 </div>
 </center>
\ No newline at end of file
diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index 625daa0..04bb771 100644
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -20,6 +20,9 @@
 <p><label><%= l(:setting_self_registration) %></label>
 <%= check_box_tag 'settings[self_registration]', 1, Setting.self_registration? %><%= hidden_field_tag 'settings[self_registration]', 0 %></p>
 
+<p><label><%= l(:label_password_lost) %></label>
+<%= check_box_tag 'settings[password_lost]', 1, Setting.password_lost? %><%= hidden_field_tag 'settings[password_lost]', 0 %></p>
+
 <p><label><%= l(:setting_attachment_max_size) %></label>
 <%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>
 
diff --git a/config/settings.yml b/config/settings.yml
index 3712099..54b3a6c 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -29,6 +29,8 @@ login_required:
   default: 0
 self_registration:
   default: 1
+password_lost:
+  default: 1
 attachment_max_size:
   format: int
   default: 5120