Fix generic users

Thanks @chrisseto!