diff --git a/src/components/validator/stash_info.rs b/src/components/validator/stash_info.rs
index c87eb2a..62c5bd2 100644
--- a/src/components/validator/stash_info.rs
+++ b/src/components/validator/stash_info.rs
@@ -173,11 +173,11 @@ impl StashInfo {
     }
 
     fn generate_and_save_new_key(&mut self) -> Result<()> {
-        let (pair, seed) = Pair::generate(); // TODO: revisit
+        let (pair, seed) = Pair::generate();
         let secret_seed = hex::encode(seed);
-        let address = AccountId32::from(pair.public().0)
-            .to_ss58check_with_version(Ss58AddressFormat::custom(1996));
         let account_id = pair.public().0;
+        let address = AccountId32::from(account_id)
+            .to_ss58check_with_version(Ss58AddressFormat::custom(1996));
         let pair_signer = PairSigner::<CasperConfig, Pair>::new(pair);
 
         let mut new_file = File::create(&self.file_path)?;
diff --git a/src/components/wallet/accounts.rs b/src/components/wallet/accounts.rs
index 3788ffa..14dcaa9 100644
--- a/src/components/wallet/accounts.rs
+++ b/src/components/wallet/accounts.rs
@@ -136,10 +136,10 @@ impl Accounts {
     }
 
     fn create_new_account(&mut self, name: String) {
-        let (pair, seed) = Pair::generate(); // TODO: generate_with_phrase()
+        let (pair, seed) = Pair::generate();
         let secret_seed = hex::encode(seed);
         let account_id = pair.public().0;
-        let address = AccountId32::from(seed)
+        let address = AccountId32::from(account_id)
             .to_ss58check_with_version(Ss58AddressFormat::custom(1996));
 
         self.log_event(
@@ -278,7 +278,7 @@ impl Accounts {
 
                 let secret_seed = hex::encode(seed);
                 let account_id = pair.public().0;
-                let address = AccountId32::from(pair.public().0)
+                let address = AccountId32::from(account_id)
                     .to_ss58check_with_version(Ss58AddressFormat::custom(1996));
 
                 let mut new_file = File::create(file_path)?;