add some more fields to admin notification
rename flag and variable, check nil user