Fixes validation issues around demo user