diff --git a/wallet/res/layout/fragment_more.xml b/wallet/res/layout/fragment_more.xml
index 32799bae7..6a3a64d74 100644
--- a/wallet/res/layout/fragment_more.xml
+++ b/wallet/res/layout/fragment_more.xml
@@ -89,43 +89,7 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/requested_username_container"
-                android:visibility="gone"
-                tools:visibility="visible"
-                style="@style/MenuRow">
-
-                <ImageView
-                    android:id="@+id/requested_username_icon"
-                    style="@style/MenuRowIcon"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_avatar_blue" />
-
-                <TextView
-                    android:id="@+id/requested_username_title"
-                    style="@style/MenuRowTitle"
-                    app:layout_constraintStart_toEndOf="@+id/requested_username_icon"
-                    app:layout_constraintTop_toTopOf="@+id/requested_username_icon"
-                    tools:text="@string/menu_invite_title" />
 
-                <TextView
-                    android:id="@+id/requested_username_subtitle"
-                    style="@style/MenuRowSubTitle"
-                    android:text="@string/requested_voting_duration"
-                    app:layout_constraintStart_toStartOf="@+id/requested_username_title"
-                    app:layout_constraintTop_toBottomOf="@+id/requested_username_title" />
-
-                <ImageView
-                    android:id="@+id/requested_username_arrow"
-                    style="@style/MenuRowArrow"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_menu_row_arrow" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
         </LinearLayout>
 
             <ViewFlipper
@@ -215,6 +179,53 @@
 
             </ViewFlipper>
 
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/requested_username_container"
+                android:visibility="gone"
+                tools:visibility="visible"
+                android:layout_height="110dp"
+                style="@style/MenuRow">
+
+                <ImageView
+                    android:id="@+id/requested_username_icon"
+                    style="@style/MenuRowIcon"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_avatar_blue" />
+
+                <TextView
+                    android:id="@+id/requested_username_title"
+                    style="@style/MenuRowTitle"
+                    app:layout_constraintStart_toEndOf="@+id/requested_username_icon"
+                    app:layout_constraintTop_toTopOf="@+id/requested_username_icon"
+                    tools:text="@string/shortcut_action_join_dashpay" />
+
+                <TextView
+                    android:id="@+id/requested_username_subtitle"
+                    style="@style/MenuRowSubTitle"
+                    android:text="@string/requested_username_has_been"
+                    app:layout_constraintStart_toStartOf="@+id/requested_username_title"
+                    app:layout_constraintTop_toBottomOf="@+id/requested_username_title" />
+
+
+                <TextView
+                    android:id="@+id/requested_username_subtitle_two"
+                    style="@style/MenuRowSubTitle"
+                    android:text="@string/requested_voting_duration"
+                    app:layout_constraintStart_toStartOf="@+id/requested_username_subtitle"
+                    app:layout_constraintTop_toBottomOf="@+id/requested_username_subtitle" />
+
+                <ImageView
+                    android:id="@+id/requested_username_arrow"
+                    style="@style/MenuRowArrow"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_menu_row_arrow" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/wallet/src/de/schildbach/wallet/database/dao/UserAlertDao.kt b/wallet/src/de/schildbach/wallet/database/dao/UserAlertDao.kt
index 7f182abfa..e81699245 100644
--- a/wallet/src/de/schildbach/wallet/database/dao/UserAlertDao.kt
+++ b/wallet/src/de/schildbach/wallet/database/dao/UserAlertDao.kt
@@ -24,7 +24,7 @@ import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface UserAlertDao {
-    @Insert(onConflict = OnConflictStrategy.ABORT)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insert(userAlert: UserAlert)
 
     @Query("UPDATE user_alerts SET dismissed = 1 WHERE stringResId = :id")
diff --git a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
index e59d16252..371688a7b 100644
--- a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
+++ b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
@@ -99,6 +99,8 @@ interface PlatformSyncService {
     fun removeContactsUpdatedListener(listener: OnContactsUpdated?)
     fun fireContactsUpdatedListeners()
 
+    suspend fun triggerPreBlockDownloadComplete()
+
     fun addPreBlockProgressListener(listener: OnPreBlockProgressListener)
     fun removePreBlockProgressListener(listener: OnPreBlockProgressListener)
 
@@ -1017,6 +1019,10 @@ class PlatformSynchronizationService @Inject constructor(
         log.info("publishing updates to tx metadata items complete")
     }
 
+    override suspend fun triggerPreBlockDownloadComplete() {
+        finishPreBlockDownload()
+    }
+
     private suspend fun finishPreBlockDownload() {
         log.info("PreDownloadBlocks: complete")
         if (config.areNotificationsDisabled()) {
@@ -1068,7 +1074,7 @@ class PlatformSynchronizationService @Inject constructor(
             preDownloadBlocks.set(true)
             lastPreBlockStage = PreBlockStage.None
             preDownloadBlocksFuture = future
-            log.info("PreDownloadBlocks: starting")
+            log.info("preBlockDownload: starting")
             if (Constants.DASHPAY_DISABLED) {
                 finishPreBlockDownload()
                 return@launch
@@ -1078,13 +1084,13 @@ class PlatformSynchronizationService @Inject constructor(
             // or if the previous restore is incomplete
             val identityData = blockchainIdentityDataDao.load()
             if (identityData == null || identityData.restoring) {
-                log.info("PreDownloadBlocks: checking for existing associated identity")
+                log.info("preBlockDownload: checking for existing associated identity")
 
                 val identity = platformRepo.getIdentityFromPublicKeyId()
                 platformRepo.onIdentityResolved?.invoke(identity)
 
                 if (identity != null) {
-                    log.info("PreDownloadBlocks: initiate recovery of existing identity ${identity.id}")
+                    log.info("preBlockDownload: initiate recovery of existing identity ${identity.id}")
                     ContextCompat.startForegroundService(
                         walletApplication,
                         CreateIdentityService.createIntentForRestore(
@@ -1094,7 +1100,7 @@ class PlatformSynchronizationService @Inject constructor(
                     )
                     return@launch
                 } else {
-                    log.info("PreDownloadBlocks: no existing identity found")
+                    log.info("preBlockDownload: no existing identity found")
                     // resume Sync process, since there is no Platform data to sync
                     finishPreBlockDownload()
                 }
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/CreateIdentityService.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/CreateIdentityService.kt
index 85e50cdb6..72ea4b75c 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/CreateIdentityService.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/CreateIdentityService.kt
@@ -29,7 +29,6 @@ import org.bitcoinj.core.RejectMessage
 import org.bitcoinj.core.RejectedTransactionException
 import org.bitcoinj.core.TransactionConfidence
 import org.bitcoinj.evolution.AssetLockTransaction
-import org.bitcoinj.wallet.Wallet
 import org.bitcoinj.wallet.authentication.AuthenticationGroupExtension
 import org.bouncycastle.crypto.params.KeyParameter
 import org.dash.wallet.common.Configuration
@@ -43,6 +42,7 @@ import org.dashj.platform.dpp.errors.concensus.ConcensusException
 import org.dashj.platform.dpp.errors.concensus.basic.identity.IdentityAssetLockTransactionOutPointAlreadyExistsException
 import org.dashj.platform.dpp.errors.concensus.basic.identity.InvalidInstantAssetLockProofSignatureException
 import org.dashj.platform.dpp.identity.Identity
+import org.dashj.platform.sdk.platform.Names
 import org.slf4j.LoggerFactory
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -353,7 +353,7 @@ class CreateIdentityService : LifecycleService() {
             // check to see if the funding transaction exists
             if (blockchainIdentity.assetLockTransaction == null) {
                 val useCoinJoin = coinJoinConfig.getMode() != CoinJoinMode.NONE
-                platformRepo.createAssetLockTransactionAsync(blockchainIdentity, encryptionKey, useCoinJoin)
+                platformRepo.createAssetLockTransactionAsync(blockchainIdentity, blockchainIdentityData.username!!, encryptionKey, useCoinJoin)
             }
         }
 
@@ -524,14 +524,14 @@ class CreateIdentityService : LifecycleService() {
                 if (e.status.code == Status.INVALID_ARGUMENT.code) {
                     val exception = GrpcExceptionInfo(e).exception
 
-                        if (exception is IdentityAssetLockTransactionOutPointAlreadyExistsException) {
-                            log.warn("Invite has already been used")
+                    if (exception is IdentityAssetLockTransactionOutPointAlreadyExistsException) {
+                        log.warn("Invite has already been used")
 
-                            // activate link or activity with the link (to show that the invite was used)
-                            // and then, wipe all blockchain identity data and status (NONE)
-                            //
-                            throw IllegalStateException("Invite has already been used", exception)
-                        }
+                        // activate link or activity with the link (to show that the invite was used)
+                        // and then, wipe all blockchain identity data and status (NONE)
+                        //
+                        throw IllegalStateException("Invite has already been used", exception)
+                    }
 
                     log.error(e.toString())
                     throw e
@@ -562,7 +562,7 @@ class CreateIdentityService : LifecycleService() {
 
     private suspend fun finishRegistration(blockchainIdentity: BlockchainIdentity, encryptionKey: KeyParameter) {
         // TODO: let's delay to make sure that the identity is propagated
-        delay(20000)
+        // delay(20000)
 
         // This Step is obsolete, verification is handled by the previous block, lets leave it in for now
         if (blockchainIdentityData.creationState <= CreationState.IDENTITY_REGISTERED) {
@@ -593,7 +593,7 @@ class CreateIdentityService : LifecycleService() {
             //
             platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
         }
-        delay(30000) // 20 sec delay for platform sync
+        // delay(30000) // 20 sec delay for platform sync
         if (blockchainIdentityData.creationState <= CreationState.USERNAME_REGISTERING) {
             platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.USERNAME_REGISTERING)
             //
@@ -619,7 +619,44 @@ class CreateIdentityService : LifecycleService() {
         val emptyProfile = DashPayProfile(blockchainIdentity.uniqueIdString, blockchainIdentity.currentUsername!!)
         platformRepo.updateDashPayProfile(emptyProfile)
 
-        addInviteUserAlert(walletApplication.wallet!!)
+        addInviteUserAlert()
+
+        // check for contested username
+        if (blockchainIdentityData.requestedUsername != null && Names.isUsernameContestable(blockchainIdentityData.requestedUsername!!)) {
+            // get the createdAt date to estimate 2 week voting period
+            // check that this username is contested and up for a vote
+            // save the verification link in a new document
+
+            if (blockchainIdentityData.creationState <= CreationState.REQUESTED_NAME_CHECKING) {
+                platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKING)
+
+                blockchainIdentity.currentVotingPeriodStarts = System.currentTimeMillis()
+                blockchainIdentity.currentUsernameRequested = true
+
+                platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
+            }
+
+
+            if (blockchainIdentityData.creationState <= CreationState.REQUESTED_NAME_CHECKED) {
+                platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKED)
+                platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
+            }
+
+            if (blockchainIdentityData.creationState <= CreationState.REQUESTED_NAME_LINK_SAVING) {
+                platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKING)
+                platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
+
+                // save the verification link
+            }
+
+            if (blockchainIdentityData.creationState <= CreationState.REQUESTED_NAME_LINK_SAVED) {
+                platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKED)
+                platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
+            }
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.VOTING)
+        } else {
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DONE)
+        }
 
         platformRepo.init()
         platformSyncService.initSync()
@@ -629,15 +666,11 @@ class CreateIdentityService : LifecycleService() {
         log.info("username registration complete")
     }
 
-    private suspend fun addInviteUserAlert(wallet: Wallet) {
-        if (blockchainIdentityData.creationState < CreationState.DONE) {
-            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DONE)
-
-            // this alert will be shown or not based on the current balance and will be
-            // managed by NotificationsLiveData
-            val userAlert = UserAlert(INVITATION_NOTIFICATION_TEXT, INVITATION_NOTIFICATION_ICON)
-            userAlertDao.insert(userAlert)
-        }
+    private suspend fun addInviteUserAlert() {
+        // this alert will be shown or not based on the current balance and will be
+        // managed by NotificationsLiveData
+        val userAlert = UserAlert(INVITATION_NOTIFICATION_TEXT, INVITATION_NOTIFICATION_ICON)
+        userAlertDao.insert(userAlert)
     }
 
     private fun handleRestoreIdentityAction(identity: ByteArray) {
@@ -651,102 +684,131 @@ class CreateIdentityService : LifecycleService() {
 
     private suspend fun restoreIdentity(identity: ByteArray) {
         log.info("Restoring identity and username")
-        platformSyncService.updateSyncStatus(PreBlockStage.StartRecovery)
+        try {
+            platformSyncService.updateSyncStatus(PreBlockStage.StartRecovery)
+
+            // use an "empty" state for each
+            blockchainIdentityData = BlockchainIdentityData(CreationState.NONE, null, null, null, true)
+
+            val authExtension =
+                walletApplication.wallet!!.getKeyChainExtension(AuthenticationGroupExtension.EXTENSION_ID) as AuthenticationGroupExtension
+            //authExtension.setWallet(walletApplication.wallet!!) // why is the wallet not set?  we didn't deserialize it probably!
+            val cftxs = authExtension.assetLockTransactions
+
+            val creditFundingTransaction: AssetLockTransaction? =
+                cftxs.find { it.identityId.bytes!!.contentEquals(identity) }
+
+            val existingBlockchainIdentityData = blockchainIdentityDataDao.load()
+            if (existingBlockchainIdentityData != null && !(existingBlockchainIdentityData.restoring /*&& existingBlockchainIdentityData.creationStateErrorMessage != null*/)) {
+                log.info("Attempting restore of existing identity and username; save credit funding txid")
+                val blockchainIdentity = platformRepo.blockchainIdentity
+                blockchainIdentity.assetLockTransaction = creditFundingTransaction
+                existingBlockchainIdentityData.creditFundingTxId = creditFundingTransaction!!.txId
+                platformRepo.updateBlockchainIdentityData(existingBlockchainIdentityData)
+                return
+            }
 
-        // use an "empty" state for each
-        blockchainIdentityData = BlockchainIdentityData(CreationState.NONE, null, null, null, true)
+            val loadingFromAssetLockTransaction = creditFundingTransaction != null
+            val existingIdentity: Identity?
 
-        val authExtension = walletApplication.wallet!!.getKeyChainExtension(AuthenticationGroupExtension.EXTENSION_ID) as AuthenticationGroupExtension
-        //authExtension.setWallet(walletApplication.wallet!!) // why is the wallet not set?  we didn't deserialize it probably!
-        val cftxs = authExtension.assetLockTransactions
+            if (!loadingFromAssetLockTransaction) {
+                existingIdentity = platformRepo.getIdentityFromPublicKeyId()
+                if (existingIdentity == null) {
+                    throw IllegalArgumentException("identity $identity does not match a credit funding transaction or it doesn't exist on the network")
+                }
+            }
 
-        val creditFundingTransaction: AssetLockTransaction? = cftxs.find { it.identityId.bytes!!.contentEquals(identity) }
+            val wallet = walletApplication.wallet!!
+            val encryptionKey = platformRepo.getWalletEncryptionKey()
+                ?: throw IllegalStateException("cannot obtain wallet encryption key")
+            val seed = wallet.keyChainSeed ?: throw IllegalStateException("cannot obtain wallet seed")
 
-        val existingBlockchainIdentityData = blockchainIdentityDataDao.load()
-        if (existingBlockchainIdentityData != null && !(existingBlockchainIdentityData.restoring /*&& existingBlockchainIdentityData.creationStateErrorMessage != null*/)) {
-            log.info("Attempting restore of existing identity and username; save credit funding txid")
-            val blockchainIdentity = platformRepo.blockchainIdentity
-            blockchainIdentity.assetLockTransaction = creditFundingTransaction
-            existingBlockchainIdentityData.creditFundingTxId = creditFundingTransaction!!.txId
-            platformRepo.updateBlockchainIdentityData(existingBlockchainIdentityData)
-            return
-        }
+            // create the Blockchain Identity object
+            val blockchainIdentity = BlockchainIdentity(platformRepo.platform.platform, 0, wallet, authExtension)
+            // this process should have been done already, otherwise the credit funding transaction
+            // will not have the credit burn keys associated with it
+            platformRepo.addWalletAuthenticationKeysAsync(seed, encryptionKey)
+            platformSyncService.updateSyncStatus(PreBlockStage.InitWallet)
 
-        val loadingFromAssetLockTransaction = creditFundingTransaction != null
-        val existingIdentity: Identity?
+            //
+            // Step 2: The credit funding registration exists, no need to create it
+            //
 
-        if (!loadingFromAssetLockTransaction) {
-            existingIdentity = platformRepo.getIdentityFromPublicKeyId()
-            if (existingIdentity == null) {
-                throw IllegalArgumentException("identity $identity does not match a credit funding transaction or it doesn't exist on the network")
+            //
+            // Step 3: Find the identity
+            //
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.IDENTITY_REGISTERING)
+            if (loadingFromAssetLockTransaction) {
+                platformRepo.recoverIdentityAsync(blockchainIdentity, creditFundingTransaction!!)
+            } else {
+                val firstIdentityKey = platformRepo.getBlockchainIdentityKey(0, encryptionKey)!!
+                platformRepo.recoverIdentityAsync(
+                    blockchainIdentity,
+                    firstIdentityKey.pubKeyHash
+                )
             }
-        }
+            platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.IDENTITY_REGISTERED)
+            platformSyncService.updateSyncStatus(PreBlockStage.GetIdentity)
 
-        val wallet = walletApplication.wallet!!
-        val encryptionKey = platformRepo.getWalletEncryptionKey() ?: throw IllegalStateException("cannot obtain wallet encryption key")
-        val seed = wallet.keyChainSeed ?: throw IllegalStateException("cannot obtain wallet seed")
-
-        // create the Blockchain Identity object
-        val blockchainIdentity = BlockchainIdentity(platformRepo.platform.platform, 0, wallet, authExtension)
-        // this process should have been done already, otherwise the credit funding transaction
-        // will not have the credit burn keys associated with it
-        platformRepo.addWalletAuthenticationKeysAsync(seed, encryptionKey)
-        platformSyncService.updateSyncStatus(PreBlockStage.InitWallet)
-
-        //
-        // Step 2: The credit funding registration exists, no need to create it
-        //
-
-        //
-        // Step 3: Find the identity
-        //
-        platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.IDENTITY_REGISTERING)
-        if (loadingFromAssetLockTransaction) {
-            platformRepo.recoverIdentityAsync(blockchainIdentity, creditFundingTransaction!!)
-        } else {
-            val firstIdentityKey = platformRepo.getBlockchainIdentityKey(0, encryptionKey)!!
-            platformRepo.recoverIdentityAsync(blockchainIdentity,
-                firstIdentityKey.pubKeyHash)
-        }
-        platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
-        platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.IDENTITY_REGISTERED)
-        platformSyncService.updateSyncStatus(PreBlockStage.GetIdentity)
-
-
-        //
-        // Step 4: We don't need to find the preorder documents
-        //
-
-        //
-        // Step 5: Find the username
-        //
-        platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.USERNAME_REGISTERING)
-        platformRepo.recoverUsernamesAsync(blockchainIdentity)
-        platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
-        platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.USERNAME_REGISTERED)
-        platformSyncService.updateSyncStatus(PreBlockStage.GetName)
-
-        //
-        // Step 6: Find the profile
-        //
-        platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DASHPAY_PROFILE_CREATING)
-        platformRepo.recoverDashPayProfile(blockchainIdentity)
-        // blockchainIdentity hasn't changed
-        platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DASHPAY_PROFILE_CREATED)
-        platformSyncService.updateSyncStatus(PreBlockStage.GetProfile)
-
-        addInviteUserAlert(walletApplication.wallet!!)
-
-        // We are finished recovering
-        platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DONE)
-        blockchainIdentityData.finishRestoration()
-        platformRepo.updateBlockchainIdentityData(blockchainIdentityData)
-        // Complete the entire process
-        platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DONE_AND_DISMISS)
-
-        platformSyncService.updateSyncStatus(PreBlockStage.RecoveryComplete)
-        platformRepo.init()
-        platformSyncService.initSync()
+
+            //
+            // Step 4: We don't need to find the preorder documents
+            //
+
+            //
+            // Step 5: Find the username
+            //
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.USERNAME_REGISTERING)
+            platformRepo.recoverUsernamesAsync(blockchainIdentity)
+            platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.USERNAME_REGISTERED)
+            platformSyncService.updateSyncStatus(PreBlockStage.GetName)
+
+            if (blockchainIdentity.currentUsername == null) {
+                platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKING)
+
+                // check if the network has this name in the queue for voting
+
+                platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKED)
+                platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
+
+
+                platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKING)
+
+
+                // recover the verification link
+
+                platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKED)
+                platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
+
+            }
+
+            //
+            // Step 6: Find the profile
+            //
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DASHPAY_PROFILE_CREATING)
+            platformRepo.recoverDashPayProfile(blockchainIdentity)
+            // blockchainIdentity hasn't changed
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DASHPAY_PROFILE_CREATED)
+            platformSyncService.updateSyncStatus(PreBlockStage.GetProfile)
+
+            addInviteUserAlert()
+
+            // We are finished recovering
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DONE)
+            blockchainIdentityData.finishRestoration()
+            platformRepo.updateBlockchainIdentityData(blockchainIdentityData)
+            // Complete the entire process
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DONE_AND_DISMISS)
+
+            platformSyncService.updateSyncStatus(PreBlockStage.RecoveryComplete)
+            platformRepo.init()
+            platformSyncService.initSync()
+        } catch (e: Exception) {
+            platformSyncService.triggerPreBlockDownloadComplete()
+            throw e
+        }
     }
 
     /**
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/HistoryHeaderAdapter.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/HistoryHeaderAdapter.kt
index 43b31b8d8..5efb76eab 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/HistoryHeaderAdapter.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/HistoryHeaderAdapter.kt
@@ -159,10 +159,25 @@ class HistoryHeaderAdapter(
                     when {
                         blockchainIdentityData.creationStateErrorMessage != null -> R.string.processing_username_unavailable_subtitle
                         blockchainIdentityData.restoring -> R.string.processing_home_step_3_restoring
+                        blockchainIdentityData.requestedUsername != null -> R.string.processing_home_step_3_requesting
                         else -> R.string.processing_home_step_3
                     }
                 )
             }
+            BlockchainIdentityData.CreationState.REQUESTED_NAME_CHECKING,
+            BlockchainIdentityData.CreationState.REQUESTED_NAME_CHECKED,
+            BlockchainIdentityData.CreationState.REQUESTED_NAME_LINK_SAVING,
+            BlockchainIdentityData.CreationState.REQUESTED_NAME_LINK_SAVED -> {
+                binding.identityCreation.progress.progress = 90
+            }
+            BlockchainIdentityData.CreationState.VOTING -> {
+                binding.identityCreation.icon.visibility = View.GONE
+                binding.identityCreation.forwardArrow.visibility = View.VISIBLE
+                binding.identityCreation.progress.visibility = View.GONE
+                binding.identityCreation.title.text = binding.root.context.getString(R.string.processing_done_title,
+                    blockchainIdentityData.username)
+                binding.identityCreation.subtitle.setText(R.string.processing_voting_subtitle)
+            }
             BlockchainIdentityData.CreationState.DONE -> {
                 binding.identityCreation.icon.visibility = View.GONE
                 binding.identityCreation.forwardArrow.visibility = View.VISIBLE
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/PlatformRepo.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/PlatformRepo.kt
index d675e3172..5ba4fce12 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/PlatformRepo.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/PlatformRepo.kt
@@ -506,10 +506,20 @@ class PlatformRepo @Inject constructor(
     //
     // Step 2 is to create the credit funding transaction
     //
-    suspend fun createAssetLockTransactionAsync(blockchainIdentity: BlockchainIdentity, keyParameter: KeyParameter?, useCoinJoin: Boolean) {
+    suspend fun createAssetLockTransactionAsync(
+        blockchainIdentity: BlockchainIdentity,
+        username: String,
+        keyParameter: KeyParameter?,
+        useCoinJoin: Boolean)
+    {
         withContext(Dispatchers.IO) {
             Context.propagate(walletApplication.wallet!!.context)
-            val cftx = blockchainIdentity.createAssetLockTransaction(Constants.DASH_PAY_FEE, keyParameter, useCoinJoin, true)
+            val fee = if (Names.isUsernameContestable(username)) {
+                Constants.DASH_PAY_FEE_CONTESTED
+            } else {
+                Constants.DASH_PAY_FEE
+            }
+            val cftx = blockchainIdentity.createAssetLockTransaction(fee, keyParameter, useCoinJoin, true)
             blockchainIdentity.initializeAssetLockTransaction(cftx)
         }
     }
@@ -537,11 +547,7 @@ class PlatformRepo @Inject constructor(
             assetLockTx.addAssetLockPublicKey(privateKey)
 
             // TODO: when all instantsend locks are deterministic, we don't need the catch block
-            val instantSendLock = try {
-                InstantSendLock(platform.params, Utils.HEX.decode(invite.instantSendLock), InstantSendLock.ISDLOCK_VERSION)
-            } catch (e: Exception) {
-                InstantSendLock(platform.params, Utils.HEX.decode(invite.instantSendLock), InstantSendLock.ISLOCK_VERSION)
-            }
+            val instantSendLock = InstantSendLock(platform.params, Utils.HEX.decode(invite.instantSendLock), InstantSendLock.ISDLOCK_VERSION)
 
             assetLockTx.confidence.setInstantSendLock(instantSendLock)
             blockchainIdentity.initializeAssetLockTransaction(assetLockTx)
@@ -1202,4 +1208,5 @@ class PlatformRepo @Inject constructor(
     suspend fun getIdentityBalance(): CreditBalanceInfo {
         return CreditBalanceInfo(platform.client.getIdentityBalance(blockchainIdentity.uniqueIdentifier))
     }
+
 }
\ No newline at end of file
diff --git a/wallet/src/de/schildbach/wallet/ui/invite/CreateInviteViewModel.kt b/wallet/src/de/schildbach/wallet/ui/invite/CreateInviteViewModel.kt
index 97ea8001d..581a7d15e 100644
--- a/wallet/src/de/schildbach/wallet/ui/invite/CreateInviteViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/invite/CreateInviteViewModel.kt
@@ -66,7 +66,7 @@ class CreateInviteViewModel @Inject constructor(
     private fun combineLatestData(): Boolean {
         val isSynced = blockchainStateData.value?.isSynced() ?: false
         val noIdentityCreatedOrInProgress = (blockchainIdentity.value == null) || blockchainIdentity.value!!.creationState == BlockchainIdentityData.CreationState.NONE
-        return isSynced && !noIdentityCreatedOrInProgress && canAffordIdentityCreation()
+        return isSynced && !noIdentityCreatedOrInProgress //&& canAffordIdentityCreation()
     }
 
     val invitationsLiveData = invitationsDao.observe().asLiveData()
diff --git a/wallet/src/de/schildbach/wallet/ui/main/MainViewModel.kt b/wallet/src/de/schildbach/wallet/ui/main/MainViewModel.kt
index 670e60aa7..d8add773f 100644
--- a/wallet/src/de/schildbach/wallet/ui/main/MainViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/main/MainViewModel.kt
@@ -697,7 +697,7 @@ class MainViewModel @Inject constructor(
     }
 
     suspend fun getRequestedUsername(): String =
-        dashPayConfig.get(BlockchainIdentityConfig.REQUESTED_USERNAME) ?: ""
+        blockchainIdentityDataDao.get(BlockchainIdentityConfig.REQUESTED_USERNAME) ?: ""
     suspend fun getInviteHistory() = invitationsDao.loadAll()
 
     private fun combineLatestData(): Boolean {
@@ -709,7 +709,7 @@ class MainViewModel @Inject constructor(
             val noIdentityCreatedOrInProgress =
                 (blockchainIdentity.value == null) || blockchainIdentity.value!!.creationState == BlockchainIdentityData.CreationState.NONE
             val canAffordIdentityCreation = walletData.canAffordIdentityCreation()
-            return isSynced && isPlatformAvailable && noIdentityCreatedOrInProgress && canAffordIdentityCreation
+            return isSynced && isPlatformAvailable && noIdentityCreatedOrInProgress //&& canAffordIdentityCreation
         }
     }
 
diff --git a/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt b/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
index 090633244..2a6031136 100644
--- a/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
@@ -33,6 +33,7 @@ import com.google.android.material.transition.MaterialFadeThrough
 import dagger.hilt.android.AndroidEntryPoint
 import de.schildbach.wallet.Constants
 import de.schildbach.wallet.WalletApplication
+import de.schildbach.wallet.database.entity.BlockchainIdentityData
 import de.schildbach.wallet.database.entity.DashPayProfile
 import de.schildbach.wallet.livedata.Status
 import de.schildbach.wallet.service.PackageInfoProvider
@@ -56,6 +57,7 @@ import org.dash.wallet.common.services.analytics.AnalyticsConstants
 import org.dash.wallet.common.services.analytics.AnalyticsService
 import org.dash.wallet.common.ui.avatar.ProfilePictureDisplay
 import org.dash.wallet.common.ui.viewBinding
+import org.dash.wallet.common.util.observe
 import org.dash.wallet.common.util.safeNavigate
 import org.slf4j.LoggerFactory
 import javax.inject.Inject
@@ -173,6 +175,30 @@ class MoreFragment : Fragment(R.layout.fragment_more) {
             startActivity(Intent(requireContext(), CreateUsernameActivity::class.java))
         }
 
+        mainActivityViewModel.blockchainIdentityDataDao.observeBase().observe(viewLifecycleOwner) {
+            if (it.creationState == BlockchainIdentityData.CreationState.VOTING) {
+                binding.joinDashpayContainer.visibility = View.GONE
+                binding.requestedUsernameContainer.visibility = View.VISIBLE
+                binding.requestedUsernameTitle.text = mainActivityViewModel.getRequestedUsername()
+            } else {
+                binding.joinDashpayContainer.visibility = View.VISIBLE
+                binding.requestedUsernameContainer.visibility = View.GONE
+            }
+        }
+
+//        lifecycleScope.launch {
+//            mainActivityViewModel.getRequestedUsername().also { username ->
+//                if (username.isNotEmpty()) {
+//                    binding.joinDashpayContainer.visibility = View.GONE
+//                    binding.requestedUsernameContainer.visibility = View.VISIBLE
+//                    binding.requestedUsernameTitle.text = username
+//                } else {
+//                    binding.joinDashpayContainer.visibility = View.VISIBLE
+//                    binding.requestedUsernameContainer.visibility = View.GONE
+//                }
+//            }
+//        }
+
         initViewModel()
 
         if (Constants.DASHPAY_DISABLED) {
@@ -251,9 +277,6 @@ class MoreFragment : Fragment(R.layout.fragment_more) {
             binding.dashpayContainer.isVisible = it
         }
 
-
-
-
         createInviteViewModel.isAbleToPerformInviteAction.observe(viewLifecycleOwner) {
             showInviteSection(it)
         }
@@ -298,16 +321,7 @@ class MoreFragment : Fragment(R.layout.fragment_more) {
         // Developer Mode Feature
         binding.invite.isVisible = showInviteSection
         lifecycleScope.launchWhenResumed {
-            mainActivityViewModel.getRequestedUsername().also { username ->
-                if (username.isNotEmpty()) {
-                    binding.joinDashpayContainer.visibility = View.GONE
-                    binding.requestedUsernameContainer.visibility = View.VISIBLE
-                    binding.requestedUsernameTitle.text = username
-                } else {
-                    binding.joinDashpayContainer.visibility = View.VISIBLE
-                    binding.requestedUsernameContainer.visibility = View.GONE
-                }
-            }
+
         }
     }
 }