You are right. I experience this a lot. I have faced login to unsubscribe also. Your solution seems to be good.