diff --git a/README.md b/README.md
index 5e841baae..7d3f6842a 100644
--- a/README.md
+++ b/README.md
@@ -61,4 +61,4 @@ Code published under AFFERO GPL v3 (see [LICENSE-AGPLv3.txt](LICENSE-AGPLv3.txt)
 
 ## Contributions
 
-See [CONTRIBUTING_EN.md](CONTRIBUTING_EN.md)
+See [CONTRIBUTING_EN.md](CONTRIBUTING_EN.md)
\ No newline at end of file
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0080e3af6..3fa634898 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -83,7 +83,7 @@ class ApplicationController < ActionController::Base
 
     def ensure_signup_complete
       if user_signed_in? &&
-        current_user.pending_finish_signup? &&
+        current_user.registering_with_oauth &&
         %w(finish_signup do_finish_signup).exclude?(action_name)
         redirect_to finish_signup_path
       end
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 15a41a395..f5682d97b 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -13,7 +13,7 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   end
 
   def after_sign_in_path_for(resource)
-    if resource.pending_finish_signup?
+    if resource.registering_with_oauth
       finish_signup_path
     else
       super(resource)
diff --git a/app/models/user.rb b/app/models/user.rb
index 4d1aaf27e..bf85babed 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -183,8 +183,8 @@ class User < ActiveRecord::Base
     self[:locale] ||= I18n.default_locale.to_s
   end
 
-  def pending_finish_signup?
-    email.blank? && unconfirmed_email.blank?
+  def confirmation_required?
+    super && !registering_with_oauth
   end
 
   private