Support for back to previous on login
Fixes