Redo the way the keychain is stored