Fixed the way we handle accounts