add demo user and change admin to use service token...
fixing credential templates to work a little better...