diff --git a/.drone.jsonnet b/.drone.jsonnet
index dc81115ce9..b088e05023 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -38,7 +38,8 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
         pull: 'always',
         environment: { ANDROID_HOME: '/usr/lib/android-sdk' },
         commands: [
-          'apt-get install -y ninja-build',
+          'apt-get install -y ninja-build openjdk-17-jdk',
+          'update-java-alternatives -s java-1.17.0-openjdk-amd64',
           './gradlew testPlayDebugUnitTestCoverageReport'
         ],
       }
@@ -78,7 +79,8 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
         pull: 'always',
         environment: { SSH_KEY: { from_secret: 'SSH_KEY' }, ANDROID_HOME: '/usr/lib/android-sdk' },
         commands: [
-          'apt-get install -y ninja-build',
+          'apt-get install -y ninja-build openjdk-17-jdk',
+          'update-java-alternatives -s java-1.17.0-openjdk-amd64',
           './gradlew assemblePlayDebug',
           './scripts/drone-static-upload.sh'
         ],
diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/OnboardingBackPressAlertDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/OnboardingBackPressAlertDialog.kt
index 2852743df0..b9ed4b92aa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/OnboardingBackPressAlertDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/OnboardingBackPressAlertDialog.kt
@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.ui.theme.LocalColors
 @Composable
 fun OnboardingBackPressAlertDialog(
     dismissDialog: () -> Unit,
-    @StringRes textId: Int = R.string.onboardingBackAccountCreation,
+    @StringRes textId: Int,
     quit: () -> Unit
 ) {
     val c = LocalContext.current
diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt
index 7e9846a385..436cb890be 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt
@@ -53,7 +53,12 @@ internal fun MessageNotificationsScreen(
         return
     }
 
-    if (state.showDialog) OnboardingBackPressAlertDialog(dismissDialog, quit = quit)
+    if (state.showingBackWarningDialogText != null)  {
+        OnboardingBackPressAlertDialog(dismissDialog,
+            textId = state.showingBackWarningDialogText,
+            quit = quit
+        )
+    }
 
     Column {
         Spacer(Modifier.weight(1f))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotificationsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotificationsViewModel.kt
index f1f5bee89f..a48f047203 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotificationsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotificationsViewModel.kt
@@ -14,6 +14,7 @@ import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import network.loki.messenger.R
 import org.session.libsession.utilities.TextSecurePreferences
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.notifications.PushRegistry
@@ -58,14 +59,16 @@ internal class MessageNotificationsViewModel(
     fun onBackPressed(): Boolean = when (state) {
         is State.CreateAccount -> false
         is State.LoadAccount -> {
-            _uiStates.update { it.copy(showDialog = true) }
+            _uiStates.update { it.copy(showingBackWarningDialogText = R.string.onboardingBackLoadAccount) }
 
             true
         }
     }
 
     fun dismissDialog() {
-        _uiStates.update { it.copy(showDialog = false) }
+        _uiStates.update {
+            it.copy(showingBackWarningDialogText = null)
+        }
     }
 
     fun quit() {
@@ -78,7 +81,7 @@ internal class MessageNotificationsViewModel(
 
     data class UiState(
         val pushEnabled: Boolean = true,
-        val showDialog: Boolean = false,
+        val showingBackWarningDialogText: Int? = null,
         val clearData: Boolean = false
     ) {
         val pushDisabled get() = !pushEnabled