Fixed accounts function duplication