Fixed a bug that always used the keychain instead of blob