diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index d9b68be2a..8241aa294 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -8,7 +8,7 @@ class RegistrationsController < Devise::RegistrationsController
   end
 
   def create
-    begin 
+    begin
       user = User.instantiate!(params[:user])
     rescue MongoMapper::DocumentNotValid => e
       user = nil
@@ -20,7 +20,7 @@ class RegistrationsController < Devise::RegistrationsController
       #redirect_to root_url
       sign_in_and_redirect(:user, user)
     else
-      redirect_to "/get_to_the_choppa"
+      redirect_to new_user_registration_path
     end
   end
 
diff --git a/config/routes.rb b/config/routes.rb
index f8de6f95c..b0ce8bbdf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -29,15 +29,15 @@ Diaspora::Application.routes.draw do
   devise_for :users, :controllers => {:registrations => "registrations"}
   match 'login',  :to => 'devise/sessions#new',      :as => "new_user_session"
   match 'logout', :to => 'devise/sessions#destroy',  :as => "destroy_user_session"
-  match 'get_to_the_choppa', :to => 'registrations#new', :as => "new_user_registration"
+  match 'signup', :to => 'registrations#new', :as => "new_user_registration"
 
   #public routes
   #
   match 'webfinger', :to => 'publics#webfinger'
   match 'hcard/users/:id',    :to => 'publics#hcard'
 
-  match '.well-known/host-meta',:to => 'publics#host_meta'        
-  match 'receive/users/:id',     :to => 'publics#receive'    
+  match '.well-known/host-meta',:to => 'publics#host_meta'
+  match 'receive/users/:id',     :to => 'publics#receive'
   match 'log', :to => "dev_utilities#log"
 
   #root