User store location when signing in
Fixes #5418
Fixes #5125