fixed scoping issue in find_with_login_instead_of_default