Confirmation link in Registration is Broken in ?xwiki=popup config, breaks validation e-mail

1. Go to
2. Fill in the form and submit
3. View Registration Email

Curriki Confirmation
to todd+900

show details 1:18 PM (2 minutes ago)

Thank you for becoming a Curriki member!

Please click this link to complete registration. http://www.curriki.org/xwiki/bin/view/Registration/Complete?xpage=popup?xwikiname=TestingTodd900&validkey=GFguObxfVGW5LWRr If the link does not open your browser, please cut and paste the link into your browser.

• The Curriki Community

Bug

The Registration URL includes ?xpage=popup when it should not.