fix key storage issue
fix urlencoded emails thing