diff --git a/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java b/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java
index 523935278bf0baa04299c6f24f945ec8d9da1fd4..b2a30ecb25bafc0b65d5e42fa1a58e8c4d57cafe 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java
@@ -54,7 +54,6 @@ import static org.briarproject.briar.api.android.AndroidNotificationManager.FAIL
 import static org.briarproject.briar.api.android.AndroidNotificationManager.FAILURE_NOTIFICATION_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_CHANNEL_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_NOTIFICATION_ID;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.REMINDER_NOTIFICATION_ID;
 
 public class BriarService extends Service {
 
@@ -103,9 +102,9 @@ public class BriarService extends Service {
 		}
 
 		// Create notification channels
-		NotificationManager nm = (NotificationManager)
-				getSystemService(NOTIFICATION_SERVICE);
 		if (SDK_INT >= 26) {
+			NotificationManager nm = (NotificationManager)
+					getSystemService(NOTIFICATION_SERVICE);
 			NotificationChannel ongoingChannel = new NotificationChannel(
 					ONGOING_CHANNEL_ID,
 					getString(R.string.ongoing_notification_title),
@@ -137,8 +136,6 @@ public class BriarService extends Service {
 		}
 		b.setPriority(PRIORITY_MIN);
 		startForeground(ONGOING_NOTIFICATION_ID, b.build());
-		// Remove sign-in reminder notification
-		nm.cancel(REMINDER_NOTIFICATION_ID);
 		// Start the services in a background thread
 		new Thread(() -> {
 			String nickname = databaseConfig.getLocalAuthorName();
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordActivity.java
index f4368dd9a0b21dd59d7106f93dacba44b692860c..40580191306895ae8d75f39ed5b261681fe354a4 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordActivity.java
@@ -1,5 +1,6 @@
 package org.briarproject.briar.android.login;
 
+import android.app.NotificationManager;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -28,6 +29,7 @@ import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
+import static org.briarproject.briar.api.android.AndroidNotificationManager.REMINDER_NOTIFICATION_ID;
 
 public class PasswordActivity extends BaseActivity {
 
@@ -88,6 +90,11 @@ public class PasswordActivity extends BaseActivity {
 		if (briarController.hasEncryptionKey()) {
 			setResult(RESULT_OK);
 			finish();
+		} else {
+			// Remove sign-in reminder notification
+			NotificationManager nm = (NotificationManager)
+					getSystemService(NOTIFICATION_SERVICE);
+			nm.cancel(REMINDER_NOTIFICATION_ID);
 		}
 	}