Is this Pull Request also including the specification of the account store in a login attempt? I ask because it seemed that this PR was only for the Custom Data implementation.