updated to allow for password expire time