diff --git a/APACHE/Map.pm b/APACHE/Map.pm
index 10200f2..2a2b189 100644
--- a/APACHE/Map.pm
+++ b/APACHE/Map.pm
@@ -28,6 +28,8 @@ fields => {
      SIZE => {},
      LASTLOGON => {},
      DESCRIPTION => {},
+     USERMAYCHANGEPWD => {},
+     PASSWORDEXPIRES => {},
      STATUS => {},
      SID => {}
 }
diff --git a/install.php b/install.php
index 4b0d8c0..2dcd45e 100644
--- a/install.php
+++ b/install.php
@@ -7,7 +7,10 @@ function extension_install_winusers()
 {
     $commonObject = new ExtensionCommon;
 
-    $commonObject -> sqlQuery("CREATE TABLE IF NOT EXISTS `winusers` (
+    // Drop table first
+    $commonObject -> sqlQuery("DROP TABLE `winusers`;");
+
+    $commonObject -> sqlQuery("CREATE TABLE `winusers` (
                              `ID` INT(11) NOT NULL AUTO_INCREMENT,
                              `HARDWARE_ID` INT(11) NOT NULL,
                              `NAME` VARCHAR(255) DEFAULT NULL,