diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5aa985ba..387c7689 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -71,9 +71,17 @@ class UsersController < ApplicationController
           render :action => "nosignup", :layout => "login"
           return
         end
-        
+
         user = User.new(params['user'])
 
+        if Tracks::Config.auth_schemes.include?('ldap') &&
+            user.auth_type == 'ldap' &&
+            !SimpleLdapAuthenticator.valid?(user.login, params['user']['password'])
+          notify :warning, "Incorrect password"
+          redirect_to :action => 'new'
+          return
+        end
+
         if Tracks::Config.auth_schemes.include?('cas')
           if user.auth_type.eql? "cas"
              user.crypted_password = "cas"