diff --git a/src/Account.cpp b/src/Account.cpp
index 7c595af..17d6d1f 100644
--- a/src/Account.cpp
+++ b/src/Account.cpp
@@ -12,15 +12,14 @@ Account::Account(
       addr_info {_addr_info},
       viewkey {_viewkey},
       spendkey {_spendkey}
-{
-}
+{}
 
 Account::Account(
         network_type _nettype,
         address_parse_info const& _addr_info,
         secret_key const& _viewkey)
     : nettype {_nettype},
-      addr_info {addr_info},
+      addr_info {_addr_info},
       viewkey {_viewkey}
 {}
 
@@ -28,7 +27,7 @@ Account::Account(
         network_type _nettype,
         address_parse_info const& _addr_info)
     : nettype {_nettype},
-      addr_info {addr_info}
+      addr_info {_addr_info}
 {}
 
 Account::Account(network_type _nettype,
diff --git a/src/Account.h b/src/Account.h
index 54c2fc8..2a929f9 100644
--- a/src/Account.h
+++ b/src/Account.h
@@ -98,6 +98,7 @@ protected:
     address_parse_info addr_info;
     boost::optional<secret_key> viewkey;
     boost::optional<secret_key> spendkey;
+    boost::optional<subaddress_index> subaddr_idx;
 };
 
 
@@ -187,6 +188,7 @@ account_factory(network_type net_type,
     return nullptr;
 }
 
+
 inline secret_key
 Account::parse_secret_key(string const& sk)
 {