Further SCP acccounts fixes