diff --git a/app/code/core/Mage/Customer/Model/Resource/Customer.php b/app/code/core/Mage/Customer/Model/Resource/Customer.php
index 865da0a61ea..de14bda8f7b 100644
--- a/app/code/core/Mage/Customer/Model/Resource/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Resource/Customer.php
@@ -375,8 +375,8 @@ public function getPasswordTimestamp($customerId)
                 []
             )
             ->joinLeft(
-                ['t2' => $this->getTable(['customer/entity', 'datetime'])],
-                't1.attribute_id = t2.attribute_id',
+                ['t2' => $this->getTable(['customer/entity', 'int'])],
+                't1.attribute_id = t2.attribute_id AND t2.entity_id = t0.entity_id',
                 []
             )
             ->where('t0.entity_id = ?', $customerId)