added email confirmation/tweaked controller to eliminate 500 error

I could reallllllllly use a merge right now....