Fix: Remove demo account when asked

We were always trying to add the demo
account, even when we wanted to remove it.