Even more refactoring, disable on account unlink, better back off
behaviour