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 b9a4c83d5..7d1cdff94 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,7 +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.ReturnShardModule;
+import org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardModule;
 import org.briarproject.briar.android.test.TestAvatarCreatorImpl;
 import org.briarproject.briar.android.viewmodel.ViewModelModule;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
@@ -92,7 +92,7 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 		GroupListModule.class,
 		GroupConversationModule.class,
 		SharingModule.class,
-		ReturnShardModule.class
+		OwnerReturnShardModule.class
 })
 public class AppModule {
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerRecoveryModeExplainerFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerRecoveryModeExplainerFragment.java
index 370cb71c8..cf047012e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerRecoveryModeExplainerFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerRecoveryModeExplainerFragment.java
@@ -24,7 +24,7 @@ public class OwnerRecoveryModeExplainerFragment extends BaseFragment {
 	@Inject
 	ViewModelProvider.Factory viewModelFactory;
 
-	private ReturnShardViewModel viewModel;
+	private OwnerReturnShardViewModel viewModel;
 
 //	@Override
 //	public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -36,7 +36,7 @@ public class OwnerRecoveryModeExplainerFragment extends BaseFragment {
 	public void injectFragment(ActivityComponent component) {
 		component.inject(this);
 		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
-				.get(ReturnShardViewModel.class);
+				.get(OwnerReturnShardViewModel.class);
 	}
 
 	@Override
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java
index 2c9f5e474..978eb949b 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java
@@ -33,9 +33,6 @@ import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.widget.LinearLayout.HORIZONTAL;
-import static android.widget.Toast.LENGTH_LONG;
-import static java.util.logging.Level.WARNING;
-import static org.briarproject.bramble.util.LogUtils.logException;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardModule.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardModule.java
index 749e37a90..b2f2da6e4 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardModule.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardModule.java
@@ -9,12 +9,12 @@ import dagger.multibindings.IntoMap;
 
 
 @Module
-public abstract class ReturnShardModule {
+public abstract class OwnerReturnShardModule {
 
 	@Binds
 	@IntoMap
-	@ViewModelKey(ReturnShardViewModel.class)
-	abstract ViewModel bindContactExchangeViewModel(
-			ReturnShardViewModel returnShardViewModel);
+	@ViewModelKey(OwnerReturnShardViewModel.class)
+	abstract ViewModel bindOwnerReturnShardViewModel(
+			OwnerReturnShardViewModel ownerReturnShardViewModel);
 
 }
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardViewModel.java
index 4c7917a6d..c77ec478c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardViewModel.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardViewModel.java
@@ -224,8 +224,8 @@ class OwnerReturnShardViewModel extends AndroidViewModel implements SecretOwnerT
 		       // Use ISO 8859-1 to encode bytes directly as a string
 		       String content = new String(payloadBytes, ISO_8859_1);
 		       qrCodeBitmap = QrCodeUtils.createQrCode(dm, content);
-		       showQrCodeFragment.setEvent(true);
 	       });
+	       showQrCodeFragment.setEvent(true);
        }
 	}
 }