diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml
index 3b43f6d8d..de07b1173 100644
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -165,6 +165,15 @@
 				android:value="org.briarproject.briar.android.account.NewOrRecoverActivity" />
 		</activity>
 
+		<activity
+			android:name="org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardActivity"
+			android:label="@string/activity_name_recovery"
+			android:parentActivityName="org.briarproject.briar.android.settings.SettingsActivity">
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.briarproject.briar.android.settings.SettingsActivity" />
+		</activity>
+
 		<activity
 			android:name="org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardActivity"
 			android:label="@string/activity_name_recovery"
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java b/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
index 7d1cdff94..49b126217 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
@@ -42,6 +42,7 @@ import org.briarproject.briar.android.privategroup.list.GroupListModule;
 import org.briarproject.briar.android.reporting.DevReportModule;
 import org.briarproject.briar.android.settings.SettingsModule;
 import org.briarproject.briar.android.sharing.SharingModule;
+import org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardModule;
 import org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardModule;
 import org.briarproject.briar.android.test.TestAvatarCreatorImpl;
 import org.briarproject.briar.android.viewmodel.ViewModelModule;
@@ -92,7 +93,8 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 		GroupListModule.class,
 		GroupConversationModule.class,
 		SharingModule.class,
-		OwnerReturnShardModule.class
+		OwnerReturnShardModule.class,
+		CustodianReturnShardModule.class
 })
 public class AppModule {
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardActivity.java
index 43b7ccb02..b5ca3e5e9 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardActivity.java
@@ -18,9 +18,10 @@ import androidx.lifecycle.ViewModelProvider;
 
 import static java.util.logging.Logger.getLogger;
 
-public class CustodianReturnShardActivity extends BriarActivity {
-	private CustodianReturnShardViewModel viewModel;
+public class CustodianReturnShardActivity extends BriarActivity
+		implements BaseFragment.BaseFragmentListener {
 
+	private CustodianReturnShardViewModel viewModel;
 	private static final Logger LOG =
 			getLogger(CustodianReturnShardActivity.class.getName());
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardModule.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardModule.java
new file mode 100644
index 000000000..d54eb18b0
--- /dev/null
+++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardModule.java
@@ -0,0 +1,19 @@
+package org.briarproject.briar.android.socialbackup.recover;
+
+import org.briarproject.briar.android.viewmodel.ViewModelKey;
+
+import androidx.lifecycle.ViewModel;
+import dagger.Binds;
+import dagger.Module;
+import dagger.multibindings.IntoMap;
+
+@Module
+public abstract class CustodianReturnShardModule {
+
+	@Binds
+	@IntoMap
+	@ViewModelKey(CustodianReturnShardViewModel.class)
+	abstract ViewModel bindCustodianReturnShardViewModel(
+			CustodianReturnShardViewModel custodianReturnShardViewModel);
+
+}