Can not log in after registering

I have since upgraded to the new Zemata but when I try to log in I get Incorrect Password. I tried re-registering my email address which it takes but then if I try to login again, I still get Incorrect Password.

My feeling is I may be in the database with my e-mail twice which is preventing me from logging in.