diff --git a/js/expire.js b/js/expire.js
index e4bb6f48b..0f4ecdb8b 100644
--- a/js/expire.js
+++ b/js/expire.js
@@ -23,7 +23,7 @@
     try {
       latestVersionWithV = await window.Fsv2.getLatestDesktopReleaseFileToFsV2();
       if (!latestVersionWithV) {
-        throw new Error('Invalid latest version. Shceduling retry...');
+        throw new Error('Invalid latest version. Scheduling retry...');
       }
       const latestVer = semver.clean(latestVersionWithV);
       if (semver.valid(latestVer)) {
diff --git a/ts/components/session/registration/RegistrationTabs.tsx b/ts/components/session/registration/RegistrationTabs.tsx
index 0676ad37e..6b26fea35 100644
--- a/ts/components/session/registration/RegistrationTabs.tsx
+++ b/ts/components/session/registration/RegistrationTabs.tsx
@@ -17,6 +17,7 @@ import {
 import { fromHex } from '../../../session/utils/String';
 import { TaskTimedOutError } from '../../../session/utils/Promise';
 import { mn_decode } from '../../../session/crypto/mnemonic';
+import { SwarmPolling } from '../../../session/snode_api/swarmPolling';
 
 export const MAX_USERNAME_LENGTH = 20;
 // tslint:disable: use-simple-attributes
@@ -190,9 +191,11 @@ export async function signInWithLinking(signInDetails: {
   try {
     await resetRegistration();
     await window.setPassword(password);
-    await signInByLinkingDevice(userRecoveryPhrase, 'english');
+    const pubkeyStr = await signInByLinkingDevice(userRecoveryPhrase, 'english');
 
     let displayNameFromNetwork = '';
+    SwarmPolling.getInstance().addPubkey(pubkeyStr);
+    SwarmPolling.getInstance().start();
 
     await PromiseUtils.waitForTask(done => {
       window.Whisper.events.on('configurationMessageReceived', (displayName: string) => {
diff --git a/ts/util/accountManager.ts b/ts/util/accountManager.ts
index 2138a161c..dc98d767c 100644
--- a/ts/util/accountManager.ts
+++ b/ts/util/accountManager.ts
@@ -83,6 +83,7 @@ export async function signInByLinkingDevice(mnemonic: string, mnemonicLanguage:
 
   // await for the first configuration message to come in.
   await registrationDone(pubKeyString, '');
+  return pubKeyString;
 }
 /**
  * This is a signup. User has no recovery and does not try to link a device