diff --git a/src/aoWebWallet/Pages/ActionPage.razor b/src/aoWebWallet/Pages/ActionPage.razor
index c3eff3f..9221414 100644
--- a/src/aoWebWallet/Pages/ActionPage.razor
+++ b/src/aoWebWallet/Pages/ActionPage.razor
@@ -165,6 +165,12 @@
         Wallet? ownerWallet = BindingContext.WalletList.Data?.Where(x => x.Address == wallet.OwnerAddress).FirstOrDefault();
 
         started = true;
+
+        if(wallet.NeedsUnlock || (ownerWallet?.NeedsUnlock ?? false))
+        {
+            ///TODO: Trigger Unlock
+        }
+
         await transactionService.SendAction(wallet, ownerWallet, AoAction);
     }
 
diff --git a/src/aoWebWallet/Pages/CreateTokenPage.razor b/src/aoWebWallet/Pages/CreateTokenPage.razor
index 7d188ce..d802813 100644
--- a/src/aoWebWallet/Pages/CreateTokenPage.razor
+++ b/src/aoWebWallet/Pages/CreateTokenPage.razor
@@ -102,6 +102,11 @@
         if (wallet == null)
             return;
 
+        if (wallet.NeedsUnlock)
+        {
+            //TODO: Trigger unlock
+        }
+
         //Run preview if not run yet
         if (data == null)
             data = CreateTokenService.GetTokenProcessCode(wallet.Address, tokenModel);
diff --git a/src/aoWebWallet/Pages/GenerateWalletPage.razor b/src/aoWebWallet/Pages/GenerateWalletPage.razor
index 9a632a1..7593dd0 100644
--- a/src/aoWebWallet/Pages/GenerateWalletPage.razor
+++ b/src/aoWebWallet/Pages/GenerateWalletPage.razor
@@ -15,37 +15,7 @@
         }
         else
         {
-            <MudPaper Class="pa-4 mt-4" Elevation="3">
-                <MudText Typo="Typo.h4" Class="mb-4">Generate Wallet</MudText>
-                <MudText Typo="Typo.body1" Class="mb-4">Enter a password to encrypt your wallet. The password must be at least 6 characters long.</MudText>
-
-                <MudTextField @bind-Value="Password"
-                              Label="Password"
-                              Variant="Variant.Outlined"
-                              InputType="@PasswordInput"
-                              Adornment="Adornment.End"
-                              AdornmentIcon="@PasswordInputIcon"
-                              OnAdornmentClick="TogglePasswordVisibility"
-                              Error="@(!string.IsNullOrEmpty(PasswordError))"
-                              ErrorText="@PasswordError" />
-
-                <MudTextField @bind-Value="ConfirmPassword"
-                              Label="Confirm Password"
-                              Variant="Variant.Outlined"
-                              InputType="@PasswordInput"
-                              Adornment="Adornment.End"
-                              AdornmentIcon="@PasswordInputIcon"
-                              OnAdornmentClick="TogglePasswordVisibility"
-                              Error="@(!string.IsNullOrEmpty(ConfirmPasswordError))"
-                              ErrorText="@ConfirmPasswordError" />
-
-                <MudButton Variant="Variant.Filled"
-                           Color="Color.Primary"
-                           OnClick="GenerateWallet"
-                           Class="mt-4">
-                    Generate Wallet
-                </MudButton>
-            </MudPaper>
+            <SetSecretKeyComponent />
         }
     }
     else
@@ -60,4 +30,12 @@
         new BreadcrumbItem("Home", href: "/"),
         new BreadcrumbItem("Generate Wallet", href: null, disabled: true)
     };
+
+    protected override void OnInitialized()
+    {
+        WatchDataLoaderVM(BindingContext.WalletList);
+        WatchProp(nameof(BindingContext.SecretKey));
+
+        base.OnInitialized();
+    }
 }
diff --git a/src/aoWebWallet/Pages/GenerateWalletPage.razor.cs b/src/aoWebWallet/Pages/GenerateWalletPage.razor.cs
index 443f6c3..7de9707 100644
--- a/src/aoWebWallet/Pages/GenerateWalletPage.razor.cs
+++ b/src/aoWebWallet/Pages/GenerateWalletPage.razor.cs
@@ -6,62 +6,6 @@ namespace aoWebWallet.Pages
 {
     public partial class GenerateWalletPage : MvvmComponentBase<MainViewModel>
     {
-        private string Password { get; set; } = string.Empty;
-        private string ConfirmPassword { get; set; } = string.Empty;
-        private bool PasswordVisible { get; set; } = false;
-        private InputType PasswordInput { get; set; } = InputType.Password;
-        private string PasswordInputIcon { get; set; } = Icons.Material.Filled.VisibilityOff;
-        private string PasswordError { get; set; } = string.Empty;
-        private string ConfirmPasswordError { get; set; } = string.Empty;
-
-        private void TogglePasswordVisibility()
-        {
-            if (PasswordVisible)
-            {
-                PasswordVisible = false;
-                PasswordInputIcon = Icons.Material.Filled.VisibilityOff;
-                PasswordInput = InputType.Password;
-            }
-            else
-            {
-                PasswordVisible = true;
-                PasswordInputIcon = Icons.Material.Filled.Visibility;
-                PasswordInput = InputType.Text;
-            }
-        }
-
-        private void GenerateWallet()
-        {
-            PasswordError = string.Empty;
-            ConfirmPasswordError = string.Empty;
-
-            if (string.IsNullOrWhiteSpace(Password) || string.IsNullOrWhiteSpace(ConfirmPassword))
-            {
-                PasswordError = "Please enter and confirm your password.";
-                return;
-            }
-
-            if (Password != ConfirmPassword)
-            {
-                ConfirmPasswordError = "Passwords do not match.";
-                return;
-            }
-
-            if (Password.Length < 6)
-            {
-                PasswordError = "Password must be at least 6 characters long.";
-                return;
-            }
-
-            if(BindingContext.WalletList.Data?.Any(x => x.NeedsUnlock) ?? true)
-            {
-                PasswordError = "Unable to set a new password. Please unlock your wallet first.";
-                return;
-            }
-
-            BindingContext.SecretKey = Password;
-
-            Snackbar.Add("Password set successfully!", Severity.Success);
-        }
+        
     }
 }
diff --git a/src/aoWebWallet/Pages/ImportWalletPage.razor b/src/aoWebWallet/Pages/ImportWalletPage.razor
new file mode 100644
index 0000000..285a0d8
--- /dev/null
+++ b/src/aoWebWallet/Pages/ImportWalletPage.razor
@@ -0,0 +1,41 @@
+@page "/import-wallet"
+@inherits MvvmComponentBase<MainViewModel>
+@inject ISnackbar Snackbar
+
+<PageTitle>Import Wallet - @Program.PageTitlePostFix</PageTitle>
+
+<MudContainer Class="mt-2 px-8" MaxWidth="MaxWidth.False">
+    <MudBreadcrumbs Class="breadcrumbs-aoww" Items="_items"></MudBreadcrumbs>
+
+    @if (BindingContext.SecretKey == null)
+    {
+        if (BindingContext.CheckNeedsUnlock())
+        {
+            <UnlockWalletComponent />
+        }
+        else
+        {
+            <SetSecretKeyComponent />
+        }
+    }
+    else
+    {
+        <AddUploadWalletComponent></AddUploadWalletComponent>
+    }
+</MudContainer>
+
+@code {
+    private List<BreadcrumbItem> _items = new List<BreadcrumbItem>
+    {
+        new BreadcrumbItem("Home", href: "/"),
+        new BreadcrumbItem("Import Wallet", href: null, disabled: true)
+    };
+
+    protected override void OnInitialized()
+    {
+        WatchDataLoaderVM(BindingContext.WalletList);
+        WatchProp(nameof(BindingContext.SecretKey));
+
+        base.OnInitialized();
+    }
+}
diff --git a/src/aoWebWallet/Pages/ImportWalletPage.razor.cs b/src/aoWebWallet/Pages/ImportWalletPage.razor.cs
new file mode 100644
index 0000000..7de9707
--- /dev/null
+++ b/src/aoWebWallet/Pages/ImportWalletPage.razor.cs
@@ -0,0 +1,11 @@
+using aoWebWallet.ViewModels;
+using Microsoft.AspNetCore.Components;
+using MudBlazor;
+
+namespace aoWebWallet.Pages
+{
+    public partial class GenerateWalletPage : MvvmComponentBase<MainViewModel>
+    {
+        
+    }
+}
diff --git a/src/aoWebWallet/Pages/Start.razor b/src/aoWebWallet/Pages/Start.razor
index 8d550af..59a6d51 100644
--- a/src/aoWebWallet/Pages/Start.razor
+++ b/src/aoWebWallet/Pages/Start.razor
@@ -6,3 +6,4 @@
 
 <AddWalletComponent />
 
+
diff --git a/src/aoWebWallet/Services/CreateTokenService.cs b/src/aoWebWallet/Services/CreateTokenService.cs
index 4dd2228..c97dbfa 100644
--- a/src/aoWebWallet/Services/CreateTokenService.cs
+++ b/src/aoWebWallet/Services/CreateTokenService.cs
@@ -33,6 +33,8 @@ public string GetTokenProcessCode(string address, CreateTokenModel tokenModel)
 
                 var address = wallet.Address;
                 string? jwk = wallet.GetJwkSecret();
+                if (wallet.NeedsUnlock)
+                    throw new Exception("Wallet is locked");
 
                 string newProcessId = await CreateEmptyProcess(tokenModel.Name, jwk);
 
diff --git a/src/aoWebWallet/Services/TransactionService.cs b/src/aoWebWallet/Services/TransactionService.cs
index 3098fa1..87ba5ee 100644
--- a/src/aoWebWallet/Services/TransactionService.cs
+++ b/src/aoWebWallet/Services/TransactionService.cs
@@ -114,13 +114,21 @@ static string RemoveColorCodes(string? input)
             }
 
             if (!string.IsNullOrEmpty(wallet.OwnerAddress) && ownerWallet?.Address == wallet.OwnerAddress
-                && !string.IsNullOrEmpty(ownerWallet?.GetJwkSecret()))
+                && (!string.IsNullOrEmpty(ownerWallet?.GetJwkSecret()) || (ownerWallet?.NeedsUnlock ?? false)))
             {
+                if(ownerWallet.NeedsUnlock)
+                    throw new Exception("Wallet is locked");
+
                 return await SendActionWithEval(ownerWallet.GetJwkSecret(), wallet.Address, action);
             }
 
-            if (!string.IsNullOrEmpty(wallet.GetJwkSecret()))
+            if (!string.IsNullOrEmpty(wallet.GetJwkSecret()) || wallet.NeedsUnlock)
+            {
+                if (wallet.NeedsUnlock)
+                    throw new Exception("Wallet is locked");
+
                 return await SendActionWithJwk(wallet.GetJwkSecret(), action);
+            }
 
             //Console.WriteLine("No Wallet to send");
             return null;
diff --git a/src/aoWebWallet/Shared/AddUploadWalletComponent.razor b/src/aoWebWallet/Shared/AddUploadWalletComponent.razor
index 0a0e36b..3dfddca 100644
--- a/src/aoWebWallet/Shared/AddUploadWalletComponent.razor
+++ b/src/aoWebWallet/Shared/AddUploadWalletComponent.razor
@@ -1,4 +1,5 @@
 @using aoWebWallet.Models
+@using aoww.Services
 @inherits MvvmComponentBase<MainViewModel>
 @inject ArweaveService ArweaveService
 @inject ISnackbar Snackbar
@@ -120,12 +121,18 @@
                                 {
                                     Address = address,
                                     Name = name,
-                                    Jwk = jwk,
+                                    JwkSecret = jwk,
                                     Source = WalletTypes.Imported,
                                     IsReadOnly = false,
                                     AddedDate = DateTimeOffset.UtcNow
                                 };
 
+                            if (!string.IsNullOrEmpty(BindingContext.SecretKey))
+                            {
+                                var jwkEncrypted = EncryptionService.EncryptWallet(BindingContext.SecretKey, jwk);
+                                wallet.JwkEncrypted = jwkEncrypted;
+                            }
+
                             _fileNames.Add(wallet);
                         }
                         catch
diff --git a/src/aoWebWallet/Shared/AddWalletComponent.razor b/src/aoWebWallet/Shared/AddWalletComponent.razor
index c31b064..480f152 100644
--- a/src/aoWebWallet/Shared/AddWalletComponent.razor
+++ b/src/aoWebWallet/Shared/AddWalletComponent.razor
@@ -33,7 +33,13 @@
                         <MudImage Src="images/json-logo.svg" Alt="hello" Elevation="25" Class="ww-image-start ar-logo-setup" />
                     </div>
                 </div>
-                <AddUploadWalletComponent></AddUploadWalletComponent>
+                <div Class="d-w-100 d-flex justify-center mt-2">
+                    <MudButton Href="/import-wallet"
+                               Variant="Variant.Filled"
+                               Color="Color.Primary">
+                        Import wallet
+                    </MudButton>
+                </div>
             </MudPaper>
         </MudItem>
     </MudGrid>
diff --git a/src/aoWebWallet/Shared/SetSecretKeyComponent.razor b/src/aoWebWallet/Shared/SetSecretKeyComponent.razor
new file mode 100644
index 0000000..cb33d6c
--- /dev/null
+++ b/src/aoWebWallet/Shared/SetSecretKeyComponent.razor
@@ -0,0 +1,98 @@
+@using aoWebWallet.Models
+@inherits MvvmComponentBase<MainViewModel>
+@inject ISnackbar Snackbar
+
+<MudPaper Class="pa-4 mt-4" Elevation="3">
+    <MudText Typo="Typo.h4" Class="mb-4">Generate Wallet</MudText>
+    <MudText Typo="Typo.body1" Class="mb-4">Enter a password to encrypt your wallet. The password must be at least 6 characters long.</MudText>
+
+    <MudTextField @bind-Value="Password"
+                  Label="Password"
+                  Variant="Variant.Outlined"
+                  InputType="@PasswordInput"
+                  Adornment="Adornment.End"
+                  AdornmentIcon="@PasswordInputIcon"
+                  OnAdornmentClick="TogglePasswordVisibility"
+                  Error="@(!string.IsNullOrEmpty(PasswordError))"
+                  ErrorText="@PasswordError" />
+
+    <MudTextField @bind-Value="ConfirmPassword"
+                  Label="Confirm Password"
+                  Variant="Variant.Outlined"
+                  InputType="@PasswordInput"
+                  Adornment="Adornment.End"
+                  AdornmentIcon="@PasswordInputIcon"
+                  OnAdornmentClick="TogglePasswordVisibility"
+                  Error="@(!string.IsNullOrEmpty(ConfirmPasswordError))"
+                  ErrorText="@ConfirmPasswordError" />
+
+    <MudButton Variant="Variant.Filled"
+               Color="Color.Primary"
+               OnClick="SetSecretKey"
+               Class="mt-4">
+        Generate Wallet
+    </MudButton>
+</MudPaper>
+
+
+
+@code {
+
+    private string Password { get; set; } = string.Empty;
+    private string ConfirmPassword { get; set; } = string.Empty;
+    private bool PasswordVisible { get; set; } = false;
+    private InputType PasswordInput { get; set; } = InputType.Password;
+    private string PasswordInputIcon { get; set; } = Icons.Material.Filled.VisibilityOff;
+    private string PasswordError { get; set; } = string.Empty;
+    private string ConfirmPasswordError { get; set; } = string.Empty;
+
+    private void TogglePasswordVisibility()
+    {
+        if (PasswordVisible)
+        {
+            PasswordVisible = false;
+            PasswordInputIcon = Icons.Material.Filled.VisibilityOff;
+            PasswordInput = InputType.Password;
+        }
+        else
+        {
+            PasswordVisible = true;
+            PasswordInputIcon = Icons.Material.Filled.Visibility;
+            PasswordInput = InputType.Text;
+        }
+    }
+
+    private void SetSecretKey()
+    {
+        PasswordError = string.Empty;
+        ConfirmPasswordError = string.Empty;
+
+        if (string.IsNullOrWhiteSpace(Password) || string.IsNullOrWhiteSpace(ConfirmPassword))
+        {
+            PasswordError = "Please enter and confirm your password.";
+            return;
+        }
+
+        if (Password != ConfirmPassword)
+        {
+            ConfirmPasswordError = "Passwords do not match.";
+            return;
+        }
+
+        if (Password.Length < 6)
+        {
+            PasswordError = "Password must be at least 6 characters long.";
+            return;
+        }
+
+        if (BindingContext.WalletList.Data?.Any(x => x.NeedsUnlock) ?? true)
+        {
+            PasswordError = "Unable to set a new password. Please unlock your wallet first.";
+            return;
+        }
+
+        BindingContext.SecretKey = Password;
+
+        Snackbar.Add("Password set successfully!", Severity.Success);
+    }
+}
diff --git a/src/aoWebWallet/Shared/UnlockWalletComponent.razor b/src/aoWebWallet/Shared/UnlockWalletComponent.razor
index 16a84b5..62b05f6 100644
--- a/src/aoWebWallet/Shared/UnlockWalletComponent.razor
+++ b/src/aoWebWallet/Shared/UnlockWalletComponent.razor
@@ -25,6 +25,8 @@
     {
         await BindingContext.TriggerUnlock();
 
+        this.StateHasChanged();
+
         return true;
     }
 }
diff --git a/src/aoWebWallet/Shared/UnlockWalletDialog.razor b/src/aoWebWallet/Shared/UnlockWalletDialog.razor
index 836d1ca..9ccfb70 100644
--- a/src/aoWebWallet/Shared/UnlockWalletDialog.razor
+++ b/src/aoWebWallet/Shared/UnlockWalletDialog.razor
@@ -40,13 +40,16 @@
                     wallet.JwkSecret = EncryptionService.DecryptWallet(Password, wallet.JwkEncrypted);
                 }
            }
+
+            MudDialog.Close(DialogResult.Ok(true));
+
         }
         catch
         {
             Progress = "Could not unlock wallets.";
         }
+
     }
 
-    //void Submit() => MudDialog.Close(DialogResult.Ok(true));
     void Cancel() => MudDialog.Cancel();
 }
\ No newline at end of file
diff --git a/src/aoWebWallet/ViewModels/MainViewModel.cs b/src/aoWebWallet/ViewModels/MainViewModel.cs
index 1daded9..eb76cec 100644
--- a/src/aoWebWallet/ViewModels/MainViewModel.cs
+++ b/src/aoWebWallet/ViewModels/MainViewModel.cs
@@ -176,6 +176,9 @@ public async Task DeleteWallet(Wallet wallet)
 
         public async Task DownloadWallet(Wallet wallet)
         {
+            if (wallet.NeedsUnlock)
+                throw new Exception("Wallet is locked");
+
             string? jwk = wallet.GetJwkSecret();
             if (string.IsNullOrEmpty(jwk))
                 return;
@@ -264,24 +267,30 @@ public async Task GetActiveArConnectAddress()
             }
         }
 
-        public Task<Transaction?> SendToken(Wallet wallet, string tokenId, string address, long amount)
-        {
-            if (wallet.Source == WalletTypes.ArConnect)
-                return SendTokenWithArConnect(tokenId, address, amount);
+        //public Task<Transaction?> SendToken(Wallet wallet, string tokenId, string address, long amount)
+        //{
+        //    if (wallet.Source == WalletTypes.ArConnect)
+        //        return SendTokenWithArConnect(tokenId, address, amount);
 
-            if (!string.IsNullOrEmpty(wallet.OwnerAddress))
-            {
-                var ownerWallet = WalletList.Data!.Where(x => x.Address == wallet.OwnerAddress).FirstOrDefault();
-                return SendTokenWithEval(ownerWallet?.GetJwkSecret(), wallet.Address, tokenId, address, amount);
+        //    if (!string.IsNullOrEmpty(wallet.OwnerAddress))
+        //    {
+        //        var ownerWallet = WalletList.Data!.Where(x => x.Address == wallet.OwnerAddress).FirstOrDefault();
+        //        if (ownerWallet?.NeedsUnlock ?? false)
+        //            throw new Exception("Wallet is locked");
+                
+        //        return SendTokenWithEval(ownerWallet?.GetJwkSecret(), wallet.Address, tokenId, address, amount);
 
-            }
+        //    }
 
-            if (!string.IsNullOrEmpty(wallet.GetJwkSecret()))
-                return SendTokenWithJwk(wallet.GetJwkSecret(), tokenId, address, amount);
+        //    if (wallet.NeedsUnlock)
+        //        throw new Exception("Wallet is locked");
 
-            return Task.FromResult<Transaction?>(default);
+        //    if (!string.IsNullOrEmpty(wallet.GetJwkSecret()))
+        //        return SendTokenWithJwk(wallet.GetJwkSecret(), tokenId, address, amount);
 
-        }
+        //    return Task.FromResult<Transaction?>(default);
+
+        //}
 
         public Task<Transaction?> SendTokenWithEval(string? jwk, string processId, string tokenId, string address, long amount)
           => LastTransactionId.DataLoader.LoadAsync(async () =>
diff --git a/src/aoWebWallet/ViewModels/WalletDetailsViewModel.cs b/src/aoWebWallet/ViewModels/WalletDetailsViewModel.cs
index e082e1a..dee5a93 100644
--- a/src/aoWebWallet/ViewModels/WalletDetailsViewModel.cs
+++ b/src/aoWebWallet/ViewModels/WalletDetailsViewModel.cs
@@ -34,6 +34,8 @@ partial void OnOwnerCanSendChanged(bool value)
 
         private void SetCanSend()
         {
+            var jwk = Wallet.GetJwkSecret();
+
             var result = Wallet.Source switch
             {
                 WalletTypes.None => false,
@@ -41,8 +43,8 @@ private void SetCanSend()
                 WalletTypes.Manual => !string.IsNullOrEmpty(Wallet.OwnerAddress) && OwnerCanSend,
                 WalletTypes.Explorer => !string.IsNullOrEmpty(Wallet.OwnerAddress) && OwnerCanSend,
                 WalletTypes.AoProcess => !string.IsNullOrEmpty(Wallet.OwnerAddress) && OwnerCanSend,
-                WalletTypes.Generated => !string.IsNullOrEmpty(Wallet.GetJwkSecret()),
-                WalletTypes.Imported => !string.IsNullOrEmpty(Wallet.GetJwkSecret()),
+                WalletTypes.Generated => !string.IsNullOrEmpty(jwk),
+                WalletTypes.Imported => !string.IsNullOrEmpty(jwk),
                 _ => false
             };
 
diff --git a/src/aoWebWallet/aoWebWallet.csproj b/src/aoWebWallet/aoWebWallet.csproj
index 901e83c..1cf078e 100644
--- a/src/aoWebWallet/aoWebWallet.csproj
+++ b/src/aoWebWallet/aoWebWallet.csproj
@@ -29,7 +29,7 @@
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.10" PrivateAssets="all" />
 		<PackageReference Include="ReactorBlazorQRCodeScanner" Version="1.0.7" />
-		<PackageReference Include="Soenneker.Blazor.Utils.Navigation" Version="2.1.357" />
+		<PackageReference Include="Soenneker.Blazor.Utils.Navigation" Version="2.1.358" />
 	</ItemGroup>
 
 	<ItemGroup>