diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 30387cc54..1077c072e 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -5,6 +5,7 @@
* Fixed crash when note reference is null in editor while hiding toolbar in landscape mode [#1504](https://github.com/Automattic/simplenote-android/pull/1504)
* [Internal] Updated list of tags to filter out collaborators (emails) [#1509](https://github.com/Automattic/simplenote-android/pull/1509)
* Fixed case in delete account button in settings [#1512](https://github.com/Automattic/simplenote-android/pull/1512)
+* Added error handling for when the user has made too many wrong credential requests at login [#1514](https://github.com/Automattic/simplenote-android/pull/1514)
2.22
-----
diff --git a/Simplenote/build.gradle b/Simplenote/build.gradle
index 1cbe4d80f..5cdd1b1a1 100644
--- a/Simplenote/build.gradle
+++ b/Simplenote/build.gradle
@@ -106,7 +106,7 @@ dependencies {
// Fastlane screengrab for screenshots automation
androidTestImplementation 'tools.fastlane:screengrab:2.0.0'
// Automattic and WordPress dependencies
- implementation 'com.automattic:simperium:v1.0.0'
+ implementation 'com.automattic:simperium:develop-86ea7abdda7aece428ca5144a0a099b727b2473e'
implementation 'com.github.Automattic:Automattic-Tracks-Android:2.1.0'
implementation 'org.wordpress:passcodelock:2.0.2'
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/authentication/SimplenoteCredentialsActivity.java b/Simplenote/src/main/java/com/automattic/simplenote/authentication/SimplenoteCredentialsActivity.java
index cedc89a75..6d49515af 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/authentication/SimplenoteCredentialsActivity.java
+++ b/Simplenote/src/main/java/com/automattic/simplenote/authentication/SimplenoteCredentialsActivity.java
@@ -44,6 +44,9 @@ public void run() {
case UNVERIFIED_ACCOUNT:
showUnverifiedAccountDialog();
break;
+ case TOO_MANY_REQUESTS:
+ showDialogError(getString(R.string.simperium_too_many_attempts));
+ break;
case INVALID_ACCOUNT:
default:
showDialogError(getString(
diff --git a/Simplenote/src/main/res/values/strings.xml b/Simplenote/src/main/res/values/strings.xml
index f1bf3ef0b..de465eb06 100644
--- a/Simplenote/src/main/res/values/strings.xml
+++ b/Simplenote/src/main/res/values/strings.xml
@@ -429,4 +429,5 @@
Cancel
Change Password
Okay
+ Too many log in attempts. Try again later.