SCP accounts fixes