diff -r 645727469415 -r 9be6dba92adf includes/sessions.php
--- a/includes/sessions.php	Sun Apr 19 18:42:21 2009 -0400
+++ b/includes/sessions.php	Sun Apr 19 19:01:08 2009 -0400
@@ -777,7 +777,7 @@
         $success = true;
       }
     }
-    else if ( $row['old_encryption'] == 2 || ( defined('ENANO_UPGRADE_USE_AES_PASSWORDS') ) )
+    else if ( $row['old_encryption'] == 2 || ( defined('ENANO_UPGRADE_USE_AES_PASSWORDS') ) && strlen($row['password']) != 40 )
     {
       // Our password field uses the 1.0RC1-1.1.5 encryption format
       $real_pass = $aes->decrypt($row['password'], $this->private_key);