Fixed master account + task lifecycle