diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index ef2b4dc9..37b7e16e 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,6 +1,7 @@
 * bug fix
   * Properly ignore path prefix on omniauthable
   * Faster uniqueness queries
+  * Rename active? to active_for_authentication? to avoid conflicts
 
 == 1.2.rc2
 
diff --git a/TODO b/TODO
deleted file mode 100644
index de2ec14a..00000000
--- a/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-* Move integration tests to Capybara
-* Better ORM integration
-* Add support to automatically refresh the access token for OAuth
-* Add test to generators using the new Rails::Generators::TestCase
diff --git a/app/controllers/devise/registrations_controller.rb b/app/controllers/devise/registrations_controller.rb
index a3a2a823..15eaa221 100644
--- a/app/controllers/devise/registrations_controller.rb
+++ b/app/controllers/devise/registrations_controller.rb
@@ -14,7 +14,7 @@ class Devise::RegistrationsController < ApplicationController
     build_resource
 
     if resource.save
-      if resource.active?
+      if resource.active_for_authentication?
         set_flash_message :notice, :signed_up
         sign_in_and_redirect(resource_name, resource)
       else