[Core] Authenticate user the right way

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | not covered
| Fixed tickets | #1335
| License       | MIT
| Doc PR        | -

/cc @stloyd