Fixed Delete and Add accounts issue