Add username lookup for core user
Add option to force core username as ident