diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp
index 68b191e9..e044c94b 100644
--- a/libraries/wallet/include/graphene/wallet/wallet.hpp
+++ b/libraries/wallet/include/graphene/wallet/wallet.hpp
@@ -214,7 +214,7 @@ class wallet_api_impl;
 class wallet_api
 {
    public:
-      wallet_api( const chain_id_type& chain_id, fc::api<login_api> rapi );
+      wallet_api( const wallet_data& initial_data, fc::api<login_api> rapi );
       virtual ~wallet_api();
 
       bool copy_wallet_file( string destination_filename );
diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp
index 1c211d32..f34dbdb7 100644
--- a/libraries/wallet/wallet.cpp
+++ b/libraries/wallet/wallet.cpp
@@ -359,9 +359,9 @@ private:
 
 public:
    wallet_api& self;
-   wallet_api_impl( wallet_api& s, const chain_id_type& chain_id, fc::api<login_api> rapi )
+   wallet_api_impl( wallet_api& s, const wallet_data& initial_data, fc::api<login_api> rapi )
       : self(s),
-        _chain_id(chain_id),
+        _chain_id(initial_data.chain_id),
         _remote_api(rapi),
         _remote_db(rapi->database()),
         _remote_net_broadcast(rapi->network_broadcast()),
@@ -372,7 +372,7 @@ public:
       {
          FC_THROW( "Remote server gave us an unexpected chain_id",
             ("remote_chain_id", remote_chain_id)
-            ("chain_id", chain_id) );
+            ("chain_id", _chain_id) );
       }
       init_prototype_ops();
       _remote_db->subscribe_to_objects( [=]( const fc::variant& obj )
@@ -380,6 +380,9 @@ public:
          fc::async([this]{resync();}, "Resync after block");
       }, {dynamic_global_property_id_type()} );
       _wallet.chain_id = _chain_id;
+      _wallet.ws_server = initial_data.ws_server;
+      _wallet.ws_user = initial_data.ws_user;
+      _wallet.ws_password = initial_data.ws_password;
    }
    virtual ~wallet_api_impl()
    {
@@ -2026,8 +2029,8 @@ void operation_printer::operator()(const asset_create_operation& op) const
 
 namespace graphene { namespace wallet {
 
-wallet_api::wallet_api(const chain_id_type& chain_id, fc::api<login_api> rapi)
-   : my(new detail::wallet_api_impl(*this, chain_id, rapi))
+wallet_api::wallet_api(const wallet_data& initial_data, fc::api<login_api> rapi)
+   : my(new detail::wallet_api_impl(*this, initial_data, rapi))
 {
 }
 
diff --git a/programs/cli_wallet/main.cpp b/programs/cli_wallet/main.cpp
index cf2c259b..aa1a0585 100644
--- a/programs/cli_wallet/main.cpp
+++ b/programs/cli_wallet/main.cpp
@@ -169,7 +169,7 @@ int main( int argc, char** argv )
       // TODO:  Error message here
       FC_ASSERT( remote_api->login( wdata.ws_user, wdata.ws_password ) );
 
-      auto wapiptr = std::make_shared<wallet_api>( wdata.chain_id, remote_api );
+      auto wapiptr = std::make_shared<wallet_api>( wdata, remote_api );
       wapiptr->set_wallet_filename( wallet_file.generic_string() );
       wapiptr->load_wallet_file();