Some minor fixes in the logic to check if we are working on cat_password or not