Thanks for the feedback everyone. I ended up restoring all three components, instead of trying to use the new 2.4.1 code (the version I restored was 2.4) and that did the trick. Guess I'll try upgrading from 2.4 to 2.41 separately.
Backup and restore
Can't login following new install + full restore
This discussion has been locked so you can no longer reply to it.