diff --git a/lib/omniauth/strategies/env.rb b/lib/omniauth/strategies/env.rb
index 9957c3c..c50dff2 100644
--- a/lib/omniauth/strategies/env.rb
+++ b/lib/omniauth/strategies/env.rb
@@ -24,7 +24,7 @@ module OmniAuth
 
         # fill in some defaults
         @user_data[:name] = @uid 
-        @user_data[:email] = env_user 
+        @user_data[:email] = env_user
 
         fill_ldap_info unless @options.empty?
 
@@ -42,10 +42,15 @@ module OmniAuth
       private
 
       def fill_ldap_info
-        adaptor = OmniAuth::LDAP::Adaptor.new @options
-
-        filter = Net::LDAP::Filter.eq('samAccountName', @uid)
-        adaptor.connection.search(base: @options[:base], filter: filter) do |entry|
+        ldap = Net::LDAP.new :host => @options[:host],
+                            :port => @options[:port],
+                            :auth => {
+                                :method => :simple,
+                                :username => @options[:bind_dn],
+                                :password => @options[:password]
+                            }
+        filter = Net::LDAP::Filter.eq('uid', @uid)
+        ldap.search(:base => @options[:base], filter: filter) do |entry|
           @user_data[:name] = "#{entry.givenname.first} #{entry.sn.first}"
           @user_data[:email] = entry.mail.first
         end
--
libgit2 0.21.2