bug fix with mergin accounts