Fix bug where we didn't run login -fpl when reusing a directory or setting a custom directory, but instead ran the shell directly. Fixes bug 2610