cleaned up the use of set_return_on_login_path to only where necessary