Double opt in problem

I have got the double opt in working pretty much OK, however, I have just noticed that the link provided is missing the email address... I can't figure out why that's not working though. Currently I am testing it by copying and pasting the link, then appending it with my email address which works for the time being, but it needs to be fixed for users of the site.

There's another problem. The user update page isn't registering that the email has been verified. I am still getting a message telling me that I need to verify my email even though it has been. Why would this be happening when I can clearly see in the DB it has change the record status from 0 to 1?

I've followed the tutorial to the best of my knowledge, and the result of it can be seen at registration.php if you want to give it a try, but I suspect you'll need the code which is attached. If there are other pages you need to see, let me know.