Split out account adding