diff --git a/src/quicksy/AndroidManifest.xml b/src/quicksy/AndroidManifest.xml
index 24b2f5e2f19fc26338e49883659b7c664d7daa18..ed68582b3a964e405f91557122624242ddc50348 100644
--- a/src/quicksy/AndroidManifest.xml
+++ b/src/quicksy/AndroidManifest.xml
@@ -10,12 +10,12 @@
         <activity
             android:name=".ui.EnterPhoneNumberActivity"
             android:label="@string/verify_your_phone_number"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTop" />
 
         <activity
             android:name=".ui.ChooseCountryActivity"
             android:label="@string/choose_a_country"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTop" />
 
         <activity
             android:name=".ui.VerifyActivity"
diff --git a/src/quicksy/java/eu/siacs/conversations/ui/EnterPhoneNumberActivity.java b/src/quicksy/java/eu/siacs/conversations/ui/EnterPhoneNumberActivity.java
index fa98ed01e714d88e4b6e2f282f7670f1e0b2d4e4..270be018cbca98619c3c67f8241cb391eb445510 100644
--- a/src/quicksy/java/eu/siacs/conversations/ui/EnterPhoneNumberActivity.java
+++ b/src/quicksy/java/eu/siacs/conversations/ui/EnterPhoneNumberActivity.java
@@ -170,7 +170,7 @@ public class EnterPhoneNumberActivity extends XmppActivity implements QuickConve
     }
 
     private void onSelectCountryClick(View view) {
-        Intent intent = new Intent(this, ChooseCountryActivity.class);
+        final Intent intent = new Intent(this, ChooseCountryActivity.class);
         startActivityForResult(intent, REQUEST_CHOOSE_COUNTRY);
     }
 
@@ -194,7 +194,7 @@ public class EnterPhoneNumberActivity extends XmppActivity implements QuickConve
     public void onActivityResult(int requestCode, int resultCode, final Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (resultCode == RESULT_OK && requestCode == REQUEST_CHOOSE_COUNTRY) {
-            String region = data.getStringExtra("region");
+            final String region = data.getStringExtra("region");
             if (region != null) {
                 this.region = region;
                 final int countryCode = PhoneNumberUtilWrapper.getInstance(this).getCountryCodeForRegion(region);