I just ran into this same issue. The fix posted by Frank1940 worked as well. I upgraded not to long ago, haven't logged in for a few weeks and when I did I encountered the exact same login issue as the OP and nothing worked to get in. Ran through Frank1940's fix and everything is as it was. Thanks Frank!