New accounts fix and something else Mikey showed me