Merge user fields when linking one already created acount to another, also refactored the authentication service to make this easier (close issue #12)