Apply patch for endpoint indentify

Applied the following patches to make the UK number acceptable.

1. fix endpoint identify
2. include user in aor contact

requested review from @Yalu

assigned to @Yalu

merged