Added ability to detect expired accounts