better CustomUser model support