diff --git a/config/routes.rb b/config/routes.rb
index 519142411..0a0396251 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -57,11 +57,18 @@ ActionController::Routing::Routes.draw do |map|
   # web site
 
   map.connect '/', :controller => 'site', :action => 'index'
+  map.connect '/edit', :controller => 'site', :action => 'edit'
+  map.connect '/export', :controller => 'site', :action => 'export'
+  map.connect '/login', :controller => 'user', :action => 'login'
+  map.connect '/logout', :controller => 'user', :action => 'logout'
+  map.connect '/user/new', :controller => 'user', :action => 'new'
   map.connect '/user/save', :controller => 'user', :action => 'save'
   map.connect '/user/confirm', :controller => 'user', :action => 'confirm'
   map.connect '/user/go_public', :controller => 'user', :action => 'go_public'
-  map.connect '/user/reset_password', :controller => 'user', :action => 'reset_password'
-  map.connect '/user/upload_image', :controller => 'user', :action => 'upload_image'
+  map.connect '/user/reset-password', :controller => 'user', :action => 'reset_password'
+  map.connect '/user/upload-image', :controller => 'user', :action => 'upload_image'
+  map.connect '/user/forgot-password', :controller => 'user', :action => 'lost_password'
+
   map.connect '/index.html', :controller => 'site', :action => 'index'
   map.connect '/edit.html', :controller => 'site', :action => 'edit'
   map.connect '/export.html', :controller => 'site', :action => 'export'
diff --git a/public/javascripts/site.js b/public/javascripts/site.js
index a7651fa45..95c0b938e 100644
--- a/public/javascripts/site.js
+++ b/public/javascripts/site.js
@@ -48,7 +48,7 @@ function updatelinks(lon,lat,zoom,layers) {
       args.lat = lat;
       args.lon = lon;
       args.zoom = zoom;
-      node.href = setArgs("/edit.html", args);
+      node.href = setArgs("/edit", args);
       node.style.fontStyle = 'normal';
     } else {
       node.href = 'javascript:alert("zoom in to edit map");';