improve the ability to automasquerade contact for registration procedure
fix compilation for linux // remove unused var
remove warnings