diff --git a/src/ui/activities/auth_activity/mod.rs b/src/ui/activities/auth_activity/mod.rs
index 8a4a458..ce9be44 100644
--- a/src/ui/activities/auth_activity/mod.rs
+++ b/src/ui/activities/auth_activity/mod.rs
@@ -38,10 +38,13 @@ extern crate unicode_width;
 use super::{Activity, Context};
 use crate::filetransfer::FileTransferProtocol;
 use crate::system::bookmarks_client::BookmarksClient;
+use crate::system::config_client::ConfigClient;
+use crate::system::environment;
 
 // Includes
 use crossterm::event::Event as InputEvent;
 use crossterm::terminal::{disable_raw_mode, enable_raw_mode};
+use std::path::PathBuf;
 use tui::style::Color;
 
 // Types
@@ -112,6 +115,7 @@ pub struct AuthActivity {
     pub setup: bool,  // Becomes true if user has requested setup
     context: Option<Context>,
     bookmarks_client: Option<BookmarksClient>,
+    config_client: Option<ConfigClient>,
     selected_field: InputField, // Selected field in AuthCredentials Form
     input_mode: InputMode,
     input_form: InputForm,
@@ -145,6 +149,7 @@ impl AuthActivity {
             setup: false,
             context: None,
             bookmarks_client: None,
+            config_client: None,
             selected_field: InputField::Address,
             input_mode: InputMode::Form,
             input_form: InputForm::AuthCredentials,
@@ -156,6 +161,42 @@ impl AuthActivity {
             recents_idx: 0,
         }
     }
+
+    /// ### init_config_client
+    ///
+    /// Initialize config client
+    fn init_config_client(&mut self) {
+        // Get config dir
+        match environment::init_config_dir() {
+            Ok(config_dir) => {
+                if let Some(config_dir) = config_dir {
+                    // Get config client paths
+                    let (config_path, ssh_dir): (PathBuf, PathBuf) =
+                        environment::get_config_paths(config_dir.as_path());
+                    match ConfigClient::new(config_path.as_path(), ssh_dir.as_path()) {
+                        Ok(cli) => {
+                            // Set default protocol
+                            self.protocol = cli.get_default_protcol();
+                            // Set client
+                            self.config_client = Some(cli);
+                        }
+                        Err(err) => {
+                            self.input_mode = InputMode::Popup(PopupType::Alert(
+                                Color::Red,
+                                format!("Could not initialize user configuration: {}", err),
+                            ))
+                        }
+                    }
+                }
+            }
+            Err(err) => {
+                self.input_mode = InputMode::Popup(PopupType::Alert(
+                    Color::Red,
+                    format!("Could not initialize configuration directory: {}", err),
+                ))
+            }
+        }
+    }
 }
 
 impl Activity for AuthActivity {
@@ -176,6 +217,10 @@ impl Activity for AuthActivity {
         if self.bookmarks_client.is_none() {
             self.init_bookmarks_client();
         }
+        // init config client
+        if self.config_client.is_none() {
+            self.init_config_client();
+        }
     }
 
     /// ### on_draw