Fixes #5422 - don't orchestrate user at login every login
Merge pull request #4070 from iNecas/5422

Fixes #5422 - don't orchestrate user at login every login