diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 414ed3f05b48552bae6367710b66841ededa4661..924dc7ebb2132a1108450574b4c24a97b21aeb7f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -30,7 +30,7 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion(15)
+    minSdkVersion(16)
     targetSdkVersion(26)
 
     applicationId = "de.kuschku.quasseldroid_ng.test"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7eb77f248de2342ed6c83bd55d8d79729426dc56..11dff78046526a3564ab59d66b6456baf7d1d02e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,12 +22,14 @@
       android:name=".ui.setup.accounts.AccountSetupActivity"
       android:exported="false"
       android:label="@string/app_name"
+      android:parentActivityName=".ui.setup.accounts.AccountSelectionActivity"
       android:theme="@style/SplashTheme"
       android:windowSoftInputMode="adjustResize" />
     <activity
       android:name=".ui.setup.accounts.AccountEditActivity"
       android:exported="false"
       android:label="@string/app_name"
+      android:parentActivityName=".ui.setup.accounts.AccountSelectionActivity"
       android:theme="@style/SplashTheme"
       android:windowSoftInputMode="adjustResize" />
     <activity