diff --git a/ldap_profile/LdapProfileConf.class.php b/ldap_profile/LdapProfileConf.class.php
index 038abf6..eedaa78 100644
--- a/ldap_profile/LdapProfileConf.class.php
+++ b/ldap_profile/LdapProfileConf.class.php
@@ -12,7 +12,7 @@ class LdapProfileConf {
   public $mapping = array();
   public $derivedMapping = array();
   public $inDatabase = FALSE;
-  public $auth_conf;
+  public $servers = array();
 
   protected $saveable = array(
     'ldap_fields',
@@ -21,7 +21,7 @@ class LdapProfileConf {
   );
 
   function __construct() {
-    $this->auth_conf = ldap_authentication_get_valid_conf();
+    $this->servers = ldap_servers_get_servers(NULL, 'enabled');
     $this->load();
   }
 
diff --git a/ldap_profile/LdapProfileConfAdmin.class.php b/ldap_profile/LdapProfileConfAdmin.class.php
index c13e37f..82643b1 100644
--- a/ldap_profile/LdapProfileConfAdmin.class.php
+++ b/ldap_profile/LdapProfileConfAdmin.class.php
@@ -40,7 +40,7 @@ class LdapProfileConfAdmin extends LdapProfileConf {
   public function drupalForm($accounts = array()) {
     $auth_conf = ldap_authentication_get_valid_conf();
 
-    if (count($this->auth_conf->servers) == 0) {
+    if (count($this->servers) == 0) {
       $message = ldap_servers_no_enabled_servers_msg('configure LDAP Profiles');
       $form['intro'] = array(
         '#type' => 'item',
@@ -94,7 +94,7 @@ class LdapProfileConfAdmin extends LdapProfileConf {
         '#description' => 'This must be altered in the ldap server configuration page',
     );
 
-    if (count($this->auth_conf->servers)) {
+    if (count($this->servers)) {
 
       $form['tokens'] = array(
         '#type' => 'fieldset',
@@ -108,7 +108,7 @@ class LdapProfileConfAdmin extends LdapProfileConf {
       );
 
       require_once(drupal_get_path('module','ldap_servers') . '/ldap_servers.functions.inc');
-      foreach ($this->auth_conf->servers as $sid => $server) {
+      foreach ($this->servers as $sid => $server) {
         if ($markup = ldap_servers_show_sample_user_tokens($sid)) {
            $form['tokens'][$sid] = array(
             '#type' => 'item',