Fixes for password redirect and sub instance scoping