diff --git a/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupActivity.java
index e80ed9b42..6b37f745c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupActivity.java
@@ -63,8 +63,9 @@ public class RemoteWipeSetupActivity extends BriarActivity implements
 			showNextFragment(new RemoteWipeSuccessFragment());
 		} else if (state.equals(RemoteWipeSetupState.FAILED)) {
 			Toast.makeText(this,
-					"Failed",
-					Toast.LENGTH_SHORT).show();
+					R.string.remote_wipe_setup_failed,
+					Toast.LENGTH_LONG).show();
+			finish();
 		} else if (state.equals(RemoteWipeSetupState.FINISHED)) {
 			finish();
 		}
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index ab7e13eeb..63f3e6d64 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -734,6 +734,7 @@
 
 	<!-- setup -->
 	<string name="remote_wipe_setup_success">Remote wipe is set up</string>
+	<string name="remote_wipe_setup_failed">Failed to set up remote wipe</string>
 
 	<!-- settings menu -->
 	<string name="pref_remote_wipe_summary">Allow trusted contacts to activate an account wipe remotely</string>