CB-2188: Fixed the password not deleting out of the keychain when migrat...

Making sure this gets into irishflute_dev