diff --git a/source/ubl-settings-system.h b/source/ubl-settings-system.h
index e7649b6..a943c08 100644
--- a/source/ubl-settings-system.h
+++ b/source/ubl-settings-system.h
@@ -66,13 +66,13 @@
 #define check_domain_access_command(targeet) yon_char_append("adcli info --domain ",target)
 #define get_domain_info_command "ubdomain-client list "
 #define domains_seek_command "ubdomain-client discover"
-#define domain_connect_command(target,user,password, addition) yon_char_unite("ubdomain-client join",!yon_char_is_empty(user)?" --user ":"",!yon_char_is_empty(user)?user:"",!yon_char_is_empty(password)?" --password ":"",!yon_char_is_empty(password)?password:""," --domain ",target, addition,NULL) 
+#define domain_connect_command(target,user,password, addition) yon_char_unite("ubdomain-client join",!yon_char_is_empty(user)?" --user \"":"",!yon_char_is_empty(user)?user:"",!yon_char_is_empty(user)?"\"":"",!yon_char_is_empty(password)?" --password \"":"",!yon_char_is_empty(password)?password:"",!yon_char_is_empty(password)?"\"":""," --domain \"",target,"\"", addition,NULL) 
 #define domain_disconnect_command(target,user,password) yon_char_unite("ubdomain-client leave",!yon_char_is_empty(user)?" --user ":"",!yon_char_is_empty(user)?user:"",!yon_char_is_empty(password)?" --password ":"",!yon_char_is_empty(password)?password:""," --domain ",target,NULL) 
-#define kerberos_addition_command(target) yon_char_unite(" --domain_server ",target,"",NULL)
-#define dns_addition_command(target) yon_char_unite(" --dns ",target,"",NULL)
-#define client_addition_command(target) yon_char_unite(" --domain_client ",target,"",NULL)
+#define kerberos_addition_command(target) yon_char_unite(" --domain_server \"",target,"\"",NULL)
+#define dns_addition_command(target) yon_char_unite(" --dns \"",target,"\"",NULL)
+#define client_addition_command(target) yon_char_unite(" --domain_client \"",target,"\"",NULL)
 
-#define domain_info(target) yon_char_unite("ubdomain-client discover --domain ",target,"",NULL)
+#define domain_info(target) yon_char_unite("ubdomain-client discover --domain \"",target,"\"",NULL)
 
 #define domain_connected_icon "com.ublinux.ubl-settings-system.plug-connected-symbolic"
 #define domain_disconnected_icon "com.ublinux.ubl-settings-system.plug-disconnected-symbolic"