diff --git a/src/transaction.rs b/src/transaction.rs
index 5cfe903..6e50a9b 100644
--- a/src/transaction.rs
+++ b/src/transaction.rs
@@ -31,7 +31,7 @@ use tokio::time::{interval, sleep};
 const NO_TRANSACTIONS_MSG: &str = "No transactions present in the body";
 const BLOCK_TIME_MS: u64 = 12000;
 const TRANSACTION_POLLER_MS: u64 = 6000;
-const TRANSACTION_PAGE_SIZE: i64 = 5;
+const TRANSACTION_PAGE_SIZE: i64 = 25;
 
 struct Wrapper(Vec<u8>);
 impl subxt::tx::Payload for Wrapper {
@@ -374,7 +374,7 @@ impl TransactionProcessor {
         }: TransactionRequest,
     ) {
         let signer = if external_id.is_some() {
-            keypair.derive([DeriveJunction::soft(external_id.unwrap())])
+            keypair.derive([DeriveJunction::hard(external_id.unwrap())])
         } else {
             keypair
         };
diff --git a/src/wallet.rs b/src/wallet.rs
index 54b17e7..c746567 100644
--- a/src/wallet.rs
+++ b/src/wallet.rs
@@ -206,7 +206,7 @@ impl DeriveWalletProcessor {
             managed: _,
         }: DeriveWalletRequest,
     ) {
-        let derived_pair = keypair.derive([DeriveJunction::soft(external_id.clone())]);
+        let derived_pair = keypair.derive([DeriveJunction::hard(external_id.clone())]);
         let derived_key = hex::encode(derived_pair.public_key().0);
         platform_client::set_wallet_account(
             client,