Index: ldap_integration.module
===================================================================
--- ldap_integration.module	(revision 383)
+++ ldap_integration.module	(working copy)
@@ -1031,7 +1031,9 @@
     else if ($form_values['pass']) {
       // === HACK STARTS ===
       // --- New code starts
-      $user = _ldap_integration_code_changed_login_validate($form_values['name'], trim($form_values['pass']));
+      $ldapUser = _ldap_integration_code_changed_login_validate($form_values['name'], trim($form_values['pass']));
+      if (!is_null($ldapUser))
+        $user = $ldapUser;
       // --- New code ends
 
       // --- Drupal's original code starts