removed password from restore + fixed email restore

+ fixed email restore