Fix/login speedup

[bdmendes]

Closes #961
Depends on #958

Review checklist

• Terms and conditions reflect the current change
• Contains enough appropriate tests
• If aimed at production, writes a new summary in whatsnew/whatsnew-pt-PT
• Properly adds an entry in changelog.md with the change
• If PR includes UI updates/additions, its description has screenshots
• Behavior is as expected
• Clean, well-structured code

[codecov]

Codecov Report

Merging #962 (1f27e34) into develop (c1e3c96) will increase coverage by 1%.
Report is 2 commits behind head on develop.
The diff coverage is 0%.

Additional details and impacted files

@@          Coverage Diff           @@
##           develop   #962   +/-   ##
======================================
+ Coverage       22%    22%   +1%     
======================================
  Files          142    142           
  Lines         4353   4345    -8     
======================================
  Hits           952    952           
+ Misses        3401   3393    -8