This is a workaround, until we can get the forced
log-in workflow properly working for these cases.

Closes #364.