There are several ways of doing this, and  I have a  feeling that you have a strong opinion on how to do this. Just like with login. I'll rework however you feel best.