diff --git a/conf/config.inc.php b/conf/config.inc.php
index 19efb37..97c5dd5 100644
--- a/conf/config.inc.php
+++ b/conf/config.inc.php
@@ -80,7 +80,6 @@
     'pwdfailuretime' => array( 'attribute' => 'pwdfailuretime', 'faclass' => 'lock', 'type' => 'date' ),
     'pwdlastsuccess' => array( 'attribute' => 'pwdlastsuccess', 'faclass' => 'lock', 'type' => 'date' ),
     'pwdpolicysubentry' => array( 'attribute' => 'pwdpolicysubentry', 'faclass' => 'lock', 'type' => 'ppolicy_dn' ),
-    'pwdreset' => array( 'attribute' => 'pwdreset', 'faclass' => 'lock', 'type' => 'boolean' ),
 );
 $activedirectory_attributes_map = array(
     'authtimestamp' => array( 'attribute' => 'lastlogon', 'faclass' => 'lock', 'type' => 'ad_date' ),
@@ -107,7 +106,7 @@
 $display_items = array('identifier', 'firstname', 'lastname', 'title', 'businesscategory', 'employeenumber', 'employeetype', 'mail', 'mailquota', 'phone', 'mobile', 'fax', 'postaladdress', 'street', 'postalcode', 'l', 'state', 'organizationalunit', 'organization', 'manager', 'secretary' );
 $display_title = "fullname";
 $display_show_undefined = false;
-$display_password_items = array('pwdchangedtime', 'pwdreset', 'pwdaccountlockedtime', 'pwdfailuretime','pwdpolicysubentry', 'authtimestamp', 'pwdlastsuccess', 'created', 'modified');
+$display_password_items = array('pwdchangedtime', 'pwdaccountlockedtime', 'pwdfailuretime','pwdpolicysubentry', 'authtimestamp', 'pwdlastsuccess', 'created', 'modified');
 $display_password_expiration_date = true;
 
 # Features
diff --git a/htdocs/display.php b/htdocs/display.php
index 4ed5b80..0cd2ba2 100644
--- a/htdocs/display.php
+++ b/htdocs/display.php
@@ -117,6 +117,8 @@
         $pwdMaxAge = $directory->getPasswordMaxAge($ldap, $dn, array('pwdPolicy' => $pwdPolicy, 'pwdMaxAge' => $ldap_password_max_age));
         $expirationDate = $directory->getPasswordExpirationDate($ldap, $dn, array('pwdMaxAge' => $pwdMaxAge));
         $isExpired = $directory->isPasswordExpired($ldap, $dn, array('pwdMaxAge' => $pwdMaxAge));
+
+        $resetAtNextConnection = $directory->resetAtNextConnection($ldap, $dn);
     }
 }
 
@@ -132,6 +134,7 @@
 $smarty->assign("unlockDate", $unlockDate);
 $smarty->assign("isExpired", $isExpired);
 $smarty->assign("ldapExpirationDate", $expirationDate ? $expirationDate->getTimestamp(): NULL);
+$smarty->assign("resetAtNextConnection", $resetAtNextConnection);
 
 $smarty->assign("edit_link", $edit_link);
 
diff --git a/templates/display.tpl b/templates/display.tpl
index b63942e..f526720 100644
--- a/templates/display.tpl
+++ b/templates/display.tpl
@@ -90,6 +90,16 @@
                         </td>
                     </tr>
                 {/if}
+                {if $resetAtNextConnection}
+                    <tr>
+                        <th class="col-md-6">
+                            {$msg_label_pwdreset}
+                        </th>
+                        <td class="col-md-6">
+                            {$msg_true}
+                        </td>
+                    </tr>
+                {/if}
                 </table>
                 </div>