diff --git a/app/src/main/java/io/xxlabs/messenger/ui/global/NetworkViewModel.kt b/app/src/main/java/io/xxlabs/messenger/ui/global/NetworkViewModel.kt
index 322b251c2bad3d3fb3422534b3a5dd3598159cbb..77eca506a04ec173ff389ba00420fa313dae6715 100644
--- a/app/src/main/java/io/xxlabs/messenger/ui/global/NetworkViewModel.kt
+++ b/app/src/main/java/io/xxlabs/messenger/ui/global/NetworkViewModel.kt
@@ -229,6 +229,7 @@ class NetworkViewModel @Inject constructor(
         Timber.v("[NETWORK VIEWMODEL] has network follower already started: $networkStatus")
         if (networkStatus == NetworkFollowerStatus.RUNNING) {
             checkStopNetworkTimer()
+            onStartCallback?.invoke(true)
         } else if (networkStatus == NetworkFollowerStatus.STOPPED) {
             startNetworkFollower(onStartCallback)
         }
@@ -391,6 +392,8 @@ class NetworkViewModel @Inject constructor(
                         onCompleteCallback?.invoke(true)
                     }.subscribe()
             )
+        } else {
+            onCompleteCallback?.invoke(true)
         }
     }
 
diff --git a/app/src/main/java/io/xxlabs/messenger/ui/intro/registration/username/UsernameRegistration.kt b/app/src/main/java/io/xxlabs/messenger/ui/intro/registration/username/UsernameRegistration.kt
index 92f7edcc6fe9e7969a2a94818e841e1a4021bae7..d029f00f2e1eca695c6397b2f6037a46ca4bc697 100644
--- a/app/src/main/java/io/xxlabs/messenger/ui/intro/registration/username/UsernameRegistration.kt
+++ b/app/src/main/java/io/xxlabs/messenger/ui/intro/registration/username/UsernameRegistration.kt
@@ -31,7 +31,6 @@ import kotlin.random.Random.Default.nextInt
 
 private const val MAX_NETWORK_RETRIES = 29
 private const val NETWORK_POLL_INTERVAL_MS = 1000L
-private const val GENERIC_ERROR_MSG = "Failed to connect to network. Please try again."
 
 /**
  * Encapsulates username registration logic.
@@ -260,6 +259,7 @@ class UsernameRegistration @AssistedInject constructor(
                     onUsernameNextClicked()
                 }
             } else {
+                delay(NETWORK_POLL_INTERVAL_MS)
                 Timber.d("Attempting to start network follower, attempt #${retries + 1}.")
                 connectToCmix(retries + 1)
             }