--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -27,6 +27,8 @@ class UsersController < ApplicationController
         current_user.activate
         flash[:notice] = "Your account has been activated, welcome!"
       end
+    else
+      flash[:error] = "Invalid activation code"
     end
     redirect_back_or_default('/')
   end

--- a/config/routes.rb
+++ b/config/routes.rb
@@ -23,6 +23,7 @@ ActionController::Routing::Routes.draw do |map|
   map.resource :account, :member => {:password => :get, :update_password => :put} do |account|
     account.resources :keys
   end
+  map.connect "users/activate/:activation_code", :controller => "users", :action => "activate"
   map.resources :users, :requirements => {:id => /.+/}
   map.resource  :sessions
   map.with_options(:controller => "projects", :action => "category") do |project_cat|
@@ -62,8 +63,6 @@ ActionController::Routing::Routes.draw do |map|
     session.logout   '/logout', :action => 'destroy'
   end
   
-  map.connect "users/activate/:activation_code", :controller => "users", :action => "activate"
-  
   map.about "about", :controller => "site", :action => "about"
 
   # Install the default route as the lowest priority.

--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -66,6 +66,14 @@ describe UsersController do
     User.authenticate('moe@example.com', 'test').should == users(:moe)
   end
   
+  it "flashes a message when the activation code is invalid" do
+    get :activate, :activation_code => "fubar"
+    response.should redirect_to('/')
+    flash[:notice].should be(nil)
+    flash[:error].should == "Invalid activation code"
+    User.authenticate('moe@example.com', 'test').should == nil
+  end
+  
   it "shows the user" do
     get :show, :id => users(:johan).login
     response.should be_success
@@ -75,5 +83,12 @@ describe UsersController do
   it "recognizes routing with dots in it" do
     params_from(:get, "/users/j.s")[:id].should == "j.s"
   end
+  
+  it "recognizes activate routes" do
+    p = params_from(:get, "/users/activate/abc123")
+    p[:controller].should == "users"
+    p[:action].should == "activate"
+    p[:activation_code].should == "abc123"
+  end
 
 end