User is now associted wiht each account
Fix merge conflicts