Fixed account setup loop