diff --git a/res/layout/activity_backup_restore.xml b/res/layout/activity_backup_restore.xml
index e7cb9e454c..210cdb59c5 100644
--- a/res/layout/activity_backup_restore.xml
+++ b/res/layout/activity_backup_restore.xml
@@ -4,11 +4,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
     <data>
-        <import type="org.thoughtcrime.securesms.loki.activities.RestoreBackupViewModel"/>
+        <import type="org.thoughtcrime.securesms.loki.activities.BackupRestoreViewModel"/>
         <import type="android.view.View"/>
         <variable
             name="viewModel"
-            type="org.thoughtcrime.securesms.loki.activities.RestoreBackupViewModel" />
+            type="org.thoughtcrime.securesms.loki.activities.BackupRestoreViewModel" />
     </data>
 
     <LinearLayout
diff --git a/src/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt
index f03a66ecad..6aeea5065f 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt
@@ -44,7 +44,7 @@ class BackupRestoreActivity : BaseActionBarActivity() {
         private const val REQUEST_CODE_BACKUP_FILE = 779955
     }
 
-    private val viewModel by viewModels<RestoreBackupViewModel>()
+    private val viewModel by viewModels<BackupRestoreViewModel>()
 
     // region Lifecycle
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -129,8 +129,6 @@ class BackupRestoreActivity : BaseActionBarActivity() {
                     )
                     DatabaseFactory.upgradeRestored(context, database)
                     NotificationChannels.restoreContactNotificationChannels(context)
-//                    TextSecurePreferences.setBackupEnabled(context, true)
-//                    TextSecurePreferences.setBackupPassphrase(context, passphrase)
                     TextSecurePreferences.setRestorationTime(context, System.currentTimeMillis())
 
                     BackupImportResult.SUCCESS
@@ -150,7 +148,6 @@ class BackupRestoreActivity : BaseActionBarActivity() {
                         TextSecurePreferences.setHasViewedSeed(context, true)
                         TextSecurePreferences.setHasSeenWelcomeScreen(context, true)
                         TextSecurePreferences.setPromptedPushRegistration(context, true)
-                        TextSecurePreferences.setIsUsingFCM(context, true)
                         TextSecurePreferences.setHasSeenMultiDeviceRemovalSheet(context)
                         TextSecurePreferences.setHasSeenLightThemeIntroSheet(context)
                         val application = ApplicationContext.getInstance(context)
@@ -188,7 +185,7 @@ class BackupRestoreActivity : BaseActionBarActivity() {
     // endregion
 }
 
-class RestoreBackupViewModel(application: Application): AndroidViewModel(application) {
+class BackupRestoreViewModel(application: Application): AndroidViewModel(application) {
 
     companion object {
         @JvmStatic
diff --git a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
index a70fb315a8..541f1b2018 100644
--- a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
+++ b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
@@ -1346,19 +1346,20 @@ public class TextSecurePreferences {
     final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
 
     final String prefsFileName;
-    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
       prefsFileName = PreferenceManager.getDefaultSharedPreferencesName(context);
     } else {
       prefsFileName = context.getPackageName() + "_preferences";
     }
 
     final LinkedList<BackupProtos.SharedPreference> prefList = new LinkedList<>();
-    addBackupEntryInt   (prefList, preferences, prefsFileName, LOCAL_REGISTRATION_ID_PREF);
-    addBackupEntryString(prefList, preferences, prefsFileName, LOCAL_NUMBER_PREF);
-    addBackupEntryString(prefList, preferences, prefsFileName, PROFILE_NAME_PREF);
-    addBackupEntryString(prefList, preferences, prefsFileName, PROFILE_AVATAR_URL_PREF);
-    addBackupEntryInt   (prefList, preferences, prefsFileName, PROFILE_AVATAR_ID_PREF);
-    addBackupEntryString(prefList, preferences, prefsFileName, PROFILE_KEY_PREF);
+    addBackupEntryInt    (prefList, preferences, prefsFileName, LOCAL_REGISTRATION_ID_PREF);
+    addBackupEntryString (prefList, preferences, prefsFileName, LOCAL_NUMBER_PREF);
+    addBackupEntryString (prefList, preferences, prefsFileName, PROFILE_NAME_PREF);
+    addBackupEntryString (prefList, preferences, prefsFileName, PROFILE_AVATAR_URL_PREF);
+    addBackupEntryInt    (prefList, preferences, prefsFileName, PROFILE_AVATAR_ID_PREF);
+    addBackupEntryString (prefList, preferences, prefsFileName, PROFILE_KEY_PREF);
+    addBackupEntryBoolean(prefList, preferences, prefsFileName, IS_USING_FCM);
 
     return prefList;
   }