Merge "Authenticate correct user's account when pattern fails multiple times." into jb-mr1-dev