diff --git a/app/views/layouts/_drawer.mobile.haml b/app/views/layouts/_drawer.mobile.haml
index 97e9f6d89..d676a2084 100644
--- a/app/views/layouts/_drawer.mobile.haml
+++ b/app/views/layouts/_drawer.mobile.haml
@@ -30,6 +30,6 @@
           = t("layouts.header.profile")
           = person_image_tag(current_user, size: :thumb_small)
       %li= link_to t("_contacts"), contacts_path
-      %li= link_to t("layouts.header.settings"), users_edit_path
+      %li= link_to t("layouts.header.settings"), edit_user_path
       %li= link_to t("layouts.application.toggle"), toggle_mobile_path
       %li= link_to t("layouts.header.logout"), destroy_user_session_path, method: :delete
diff --git a/config/routes.rb b/config/routes.rb
index 1c14ab70b..520e98551 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -115,12 +115,11 @@ Diaspora::Application.routes.draw do
     get "getting_started_completed" => :getting_started_completed
   end
 
-  # This is a hack to overide a route created by devise.
-  # I couldn't find anything in devise to skip that route, see Bug #961
-  get 'users/edit' => redirect('/user/edit')
-
-  devise_for :users, :controllers => {:registrations => "registrations",
-                                      :sessions      => "sessions"}
+  devise_for :users, controllers: {sessions: :sessions}, skip: :registration
+  devise_scope :user do
+    get "/users/sign_up" => "registrations#new",    :as => :new_user_registration
+    post "/users"        => "registrations#create", :as => :user_registration
+  end
 
   #legacy routes to support old invite routes
   get 'users/invitation/accept' => 'invitations#edit'
diff --git a/features/desktop/change_email.feature b/features/desktop/change_email.feature
index 87eed0b01..c13b53275 100644
--- a/features/desktop/change_email.feature
+++ b/features/desktop/change_email.feature
@@ -3,7 +3,7 @@ Feature: Change email
 
   Scenario: Change my email
     Given I am signed in
-    When I go to the users edit page
+    When I go to the edit user page
     And I fill in the following:
       | user_email         | new_email@newplac.es           |
     And I press "Change email"
@@ -14,7 +14,7 @@ Feature: Change email
 
   Scenario: Change my email preferences
     Given I am signed in
-    When I go to the users edit page
+    When I go to the edit user page
     And I uncheck "user_email_preferences_mentioned"
     And I press "change_email_preferences"
     Then I should see "Email notifications changed"
diff --git a/features/desktop/change_password.feature b/features/desktop/change_password.feature
index 8096c22d5..f37ebe045 100644
--- a/features/desktop/change_password.feature
+++ b/features/desktop/change_password.feature
@@ -3,7 +3,7 @@ Feature: Change password
 
   Scenario: Change my password
     Given I am signed in
-    When I go to the users edit page
+    When I go to the edit user page
     And I fill out change password section with my password and "newsecret" and "newsecret"
     And I press "Change password"
     Then I should see "Password changed"
diff --git a/features/desktop/closes_account.feature b/features/desktop/closes_account.feature
index 5e08c6ca9..613029c13 100644
--- a/features/desktop/closes_account.feature
+++ b/features/desktop/closes_account.feature
@@ -6,7 +6,7 @@ Feature: Close account
 
   Scenario: user closes account
     Given I am signed in
-    When I go to the users edit page
+    When I go to the edit user page
     And I click on selector "#close_account"
     Then I should see a modal
     And I should see "Hey, please don’t go!" within "#closeAccountModal"
diff --git a/features/mobile/change_password.feature b/features/mobile/change_password.feature
index e191ddb18..f30edb215 100644
--- a/features/mobile/change_password.feature
+++ b/features/mobile/change_password.feature
@@ -6,7 +6,7 @@ Feature: Change password
 
   Scenario: Change my password
     Given I am signed in on the mobile website
-    When I go to the users edit page
+    When I go to the edit user page
     And I fill out change password section with my password and "newsecret" and "newsecret"
     And I press "Change password"
     Then I should see "Password changed"
diff --git a/features/mobile/closes_account.feature b/features/mobile/closes_account.feature
index 3f659023f..2854e1d6e 100644
--- a/features/mobile/closes_account.feature
+++ b/features/mobile/closes_account.feature
@@ -6,7 +6,7 @@ Feature: Close account
 
   Scenario: user closes account
     Given I am signed in on the mobile website
-    When I go to the users edit page
+    When I go to the edit user page
     And I click on selector "#close_account"
     Then I should see a modal
     And I should see "Hey, please don’t go!" within "#closeAccountModal"