Code cleanup, auto-merge existing accounts with Facebook