added additional user profile fields
log conflict grrrr