diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index c75f64e1..b1500d42 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -137,9 +137,9 @@ class AccountController < ApplicationController
 
   def password_authentication
     user = User.try_to_login(params[:username], params[:password])
+
     if user.nil?
-      # Invalid credentials
-      flash.now[:error] = l(:notice_account_invalid_creditentials)
+      invalid_credentials
     elsif user.new_record?
       onthefly_creation_failed(user, {:login => user.login, :auth_source_id => user.auth_source_id })
     else
@@ -209,6 +209,10 @@ class AccountController < ApplicationController
     render :action => 'register'
   end
 
+  def invalid_credentials
+    flash.now[:error] = l(:notice_account_invalid_creditentials)
+  end
+
   # Register a user for email activation.
   #
   # Pass a block for behavior when a user fails to save