futher changes to the remove account bug