diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index f2f959e..81f8b84 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -490,6 +490,7 @@ void ShopOperationSuccess(ShopOperation op, const char* logMessage, RestoreState
     }
     else if (op == SHOP_OPERATION_GET_IVS)
     {
+        CreateTransferAccountFinishedFile();
         CreateDownloadIvsFinishedFile();
     }
 
@@ -1052,15 +1053,8 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
 
         case TRANSFER_ACCOUNT:
         {
-            ShopOperationSingleTemplate(manager, operationMessage, SHOP_OPERATION_CONNECT, "Transfer Account",
-                    "Transfer Account Finished.\n", "Transfer Account Failed. Retrying...", TRANSFER_ACCOUNT_DONE);
-        }
-        break;
-
-        case TRANSFER_ACCOUNT_DONE:
-        {
-            CreateTransferAccountFinishedFile();
-            s_RestoreState = STARTUP;
+            ShopOperationSingleTemplate(manager, operationMessage, SHOP_OPERATION_GET_IVS, "Transfer Account",
+                    "Transfer Account Finished.\n", "Transfer Account Failed. Retrying...", DOWNLOAD_IVS_DONE);
         }
         break;