diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py
index 8989688..622ec08 100644
--- a/x2gobroker/defaults.py
+++ b/x2gobroker/defaults.py
@@ -242,8 +242,8 @@ X2GOBROKER_CONFIG_DEFAULTS = {
         'default-session-autologin': False,
         'default-authorized-keys': '%h/.x2go/authorized_keys',
         'default-sshproxy-authorized-keys': '%h/.x2go/authorized_keys',
-        'default-agent-query-mode': 'NONE',
-        'default-agent-hostkey-policy': 'RejectPolicy',
+        'default-agent-query-mode': 'SSH',
+        'default-agent-hostkey-policy': 'AutoAddPolicy',
         'default-portscan-x2goservers': True,
         'default-use-load-checker': False,
         'load-checker-intervals': 300,