diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml
index 30f3ab4a4..e4e606166 100644
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -134,6 +134,15 @@
 			</intent-filter>
 		</activity>
 
+		<activity
+			android:name="org.briarproject.briar.android.account.NewOrRecoverActivity"
+			android:label="@string/activity_name_new_or_recover_account"
+			android:parentActivityName="org.briarproject.briar.android.login.StartupActivity">
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.briarproject.briar.android.login.StartupActivity" />
+		</activity>
+
 		<activity
 			android:name="org.briarproject.briar.android.socialbackup.DistributedBackupActivity"
 			android:label="@string/activity_name_distributed_backup"
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/NewOrRecoverActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/account/NewOrRecoverActivity.java
new file mode 100644
index 000000000..f8f872b94
--- /dev/null
+++ b/briar-android/src/main/java/org/briarproject/briar/android/account/NewOrRecoverActivity.java
@@ -0,0 +1,47 @@
+package org.briarproject.briar.android.account;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.activity.BaseActivity;
+import org.briarproject.briar.android.fragment.BaseFragment;
+
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_TASK_ON_HOME;
+
+public class NewOrRecoverActivity extends BaseActivity implements
+		BaseFragment.BaseFragmentListener, SetupNewAccountChosenListener {
+
+	@Override
+	public void injectActivity(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Override
+	public void onCreate(Bundle state) {
+		super.onCreate(state);
+		// fade-in after splash screen instead of default animation
+		overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
+        setContentView(R.layout.activity_fragment_container);
+		NewOrRecoverFragment fragment = NewOrRecoverFragment.newInstance();
+		showInitialFragment(fragment);
+	}
+
+	@Override
+	public void setupNewAccountChosen () {
+		finish();
+		Intent i = new Intent(this, SetupActivity.class);
+		i.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP |
+				FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_TASK_ON_HOME);
+		startActivity(i);
+	}
+
+	@Override
+	public void runOnDbThread(Runnable runnable) {
+
+	}
+}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/NewOrRecoverFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/account/NewOrRecoverFragment.java
new file mode 100644
index 000000000..4ad91de57
--- /dev/null
+++ b/briar-android/src/main/java/org/briarproject/briar/android/account/NewOrRecoverFragment.java
@@ -0,0 +1,63 @@
+package org.briarproject.briar.android.account;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public class NewOrRecoverFragment extends BaseFragment {
+
+	public static final String TAG = NewOrRecoverFragment.class.getName();
+
+	protected SetupNewAccountChosenListener listener;
+
+	public static NewOrRecoverFragment newInstance() {
+		Bundle bundle = new Bundle();
+		NewOrRecoverFragment fragment = new NewOrRecoverFragment();
+		fragment.setArguments(bundle);
+		return fragment;
+	}
+	@Override
+	public void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		requireActivity().setTitle(R.string.setup_title);
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable
+			ViewGroup container, @Nullable Bundle savedInstanceState) {
+		View view = inflater.inflate(R.layout.fragment_new_or_recover,
+				container, false);
+		Button button = view.findViewById(R.id.buttonSetupNewAccount);
+		button.setOnClickListener(e -> {
+			listener.setupNewAccountChosen();
+		});
+		return view;
+	}
+
+	@Override
+	public void onAttach(Context context) {
+		super.onAttach(context);
+		listener = (SetupNewAccountChosenListener) context;
+	}
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/SetupNewAccountChosenListener.java b/briar-android/src/main/java/org/briarproject/briar/android/account/SetupNewAccountChosenListener.java
new file mode 100644
index 000000000..b404b7573
--- /dev/null
+++ b/briar-android/src/main/java/org/briarproject/briar/android/account/SetupNewAccountChosenListener.java
@@ -0,0 +1,8 @@
+package org.briarproject.briar.android.account;
+
+import androidx.annotation.UiThread;
+
+public interface SetupNewAccountChosenListener {
+	@UiThread
+	void setupNewAccountChosen();
+}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
index 836452a60..d90007f79 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
@@ -7,6 +7,8 @@ import org.briarproject.briar.android.AndroidComponent;
 import org.briarproject.briar.android.StartupFailureActivity;
 import org.briarproject.briar.android.account.AuthorNameFragment;
 import org.briarproject.briar.android.account.DozeFragment;
+import org.briarproject.briar.android.account.NewOrRecoverActivity;
+import org.briarproject.briar.android.account.NewOrRecoverFragment;
 import org.briarproject.briar.android.account.SetPasswordFragment;
 import org.briarproject.briar.android.account.SetupActivity;
 import org.briarproject.briar.android.account.UnlockActivity;
@@ -89,6 +91,7 @@ import org.briarproject.briar.android.socialbackup.creation.CreateBackupControll
 import org.briarproject.briar.android.socialbackup.creation.CreateBackupModule;
 import org.briarproject.briar.android.splash.SplashScreenActivity;
 import org.briarproject.briar.android.test.TestDataActivity;
+import org.h2.util.New;
 
 import dagger.Component;
 
@@ -193,6 +196,8 @@ public interface ActivityComponent {
 
 	void inject(CrashReportActivity crashReportActivity);
 
+	void inject(NewOrRecoverActivity newOrRecoverActivity);
+
 	// Fragments
 
 	void inject(AuthorNameFragment fragment);
@@ -263,5 +268,7 @@ public interface ActivityComponent {
 
 	void inject(ExistingBackupFragment existingBackupFragment);
 
+	void inject(NewOrRecoverFragment newOrRecoverFragment);
+
 	void inject(OldDistributedBackupActivity oldDistributedBackupActivity);
 }
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java
index faf469c28..0303d7447 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java
@@ -7,6 +7,7 @@ import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.BriarService;
+import org.briarproject.briar.android.account.NewOrRecoverActivity;
 import org.briarproject.briar.android.account.SetupActivity;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BaseActivity;
@@ -107,7 +108,7 @@ public class StartupActivity extends BaseActivity implements
 	private void onAccountDeleted() {
 		setResult(RESULT_CANCELED);
 		finish();
-		Intent i = new Intent(this, SetupActivity.class);
+		Intent i = new Intent(this, NewOrRecoverActivity.class);
 		i.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP |
 				FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_TASK_ON_HOME);
 		startActivity(i);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ShardsSentFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ShardsSentFragment.java
index bfac28d3f..79d3d56a5 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ShardsSentFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ShardsSentFragment.java
@@ -3,9 +3,6 @@ package org.briarproject.briar.android.socialbackup;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -17,8 +14,6 @@ import org.briarproject.briar.android.fragment.BaseFragment;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import static java.util.Objects.requireNonNull;
-
 public class ShardsSentFragment extends BaseFragment {
 
     public static final String TAG = ShardsSentFragment.class.getName();
diff --git a/briar-android/src/main/res/layout/fragment_new_or_recover.xml b/briar-android/src/main/res/layout/fragment_new_or_recover.xml
new file mode 100644
index 000000000..ad5ec624b
--- /dev/null
+++ b/briar-android/src/main/res/layout/fragment_new_or_recover.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/linearLayout"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:paddingLeft="@dimen/margin_large"
+	android:paddingTop="@dimen/margin_medium"
+	android:paddingRight="@dimen/margin_large"
+	android:paddingBottom="@dimen/margin_medium"
+	tools:showIn="@layout/activity_preview_welcome">
+
+	<Button
+		android:id="@+id/buttonSetupNewAccount"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:drawableLeft="@drawable/ic_contacts"
+		android:text="@string/setup_new_account"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent" />
+
+	<Button
+		android:id="@+id/buttonRestoreAccount"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:drawableLeft="@drawable/ic_repeat"
+		android:text="@string/setup_restore_account"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/buttonSetupNewAccount" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 2504b385f..9caff706b 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -716,4 +716,5 @@
 	<string name="social_backup_shard_received">You have received a social backup shard.</string>
 	<string name="social_backup_shard_sent">You have sent a social backup shard.</string>
 
+	<string name="activity_name_new_or_recover_account">Create new account or recover existing account</string>
 </resources>