@lhazlewood could you please take a look at this PR as well? We would want to release this along the Social Login. DefaultAccountStoreMapping has a bug that this PR fixes.