added account expiration check