Fixed --demo argument, stripping domains of usernames for demo purposes.