5 files changed, 6 insertions, 6 deletions
diff --git a/mullvad-cli/src/cmds/account.rs b/mullvad-cli/src/cmds/account.rs
index bab9f525f6..4d42c8c226 100644
--- a/mullvad-cli/src/cmds/account.rs
+++ b/mullvad-cli/src/cmds/account.rs
@@ -59,8 +59,8 @@ impl Account {
 
     fn get(&self) -> Result<()> {
         let mut rpc = new_rpc_client()?;
-        let account_token = rpc.get_account()?;
-        if let Some(account_token) = account_token {
+        let settings = rpc.get_settings()?;
+        if let Some(account_token) = settings.get_account_token() {
             println!("Mullvad account: {}", account_token);
             let expiry = rpc.get_account_data(account_token)?;
             println!("Expires at     : {}", expiry.expiry);
diff --git a/mullvad-cli/src/cmds/auto_connect.rs b/mullvad-cli/src/cmds/auto_connect.rs
index 5061f67fb8..7117c0f2aa 100644
--- a/mullvad-cli/src/cmds/auto_connect.rs
+++ b/mullvad-cli/src/cmds/auto_connect.rs
@@ -49,7 +49,7 @@ impl AutoConnect {
 
     fn get(&self) -> Result<()> {
         let mut rpc = new_rpc_client()?;
-        let auto_connect = rpc.get_auto_connect()?;
+        let auto_connect = rpc.get_settings()?.get_auto_connect();
         println!("Autoconnect: {}", if auto_connect { "on" } else { "off" });
         Ok(())
     }
diff --git a/mullvad-cli/src/cmds/lan.rs b/mullvad-cli/src/cmds/lan.rs
index 65754e3425..80a50a5047 100644
--- a/mullvad-cli/src/cmds/lan.rs
+++ b/mullvad-cli/src/cmds/lan.rs
@@ -48,7 +48,7 @@ impl Lan {
 
     fn get(&self) -> Result<()> {
         let mut rpc = new_rpc_client()?;
-        let allow_lan = rpc.get_allow_lan()?;
+        let allow_lan = rpc.get_settings()?.get_allow_lan();
         println!(
             "Local network sharing setting: {}",
             if allow_lan { "allow" } else { "block" }
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index 57cc934b03..70efb6362a 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -191,7 +191,7 @@ impl Relay {
 
     fn get(&self) -> Result<()> {
         let mut rpc = new_rpc_client()?;
-        let constraints = rpc.get_relay_settings()?;
+        let constraints = rpc.get_settings()?.get_relay_settings();
         println!("Current constraints: {:#?}", constraints);
 
         Ok(())
diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs
index 04afadf156..fee9188c5d 100644
--- a/mullvad-cli/src/cmds/tunnel.rs
+++ b/mullvad-cli/src/cmds/tunnel.rs
@@ -118,7 +118,7 @@ impl Tunnel {
 
     fn get_tunnel_options() -> Result<TunnelOptions> {
         let mut rpc = new_rpc_client()?;
-        Ok(rpc.get_tunnel_options()?)
+        Ok(rpc.get_settings()?.get_tunnel_options().clone())
     }
 
     fn print_common_tunnel_options(options: &TunnelOptions) {