Fix to prevent multiple accounts creation