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