diff --git a/CHANGES b/CHANGES
index 5f0f8ba..f3aadbe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ Release 9.3-dev
 * support Xcode compilation
 * new module: cobaltstrike by ultimaiiii, thank you!
 * fix for ssh to support -M or ip/range
+* fix for rdp to detect empty passwords
 * for vnc/cisco/... protocols that only check for a password, skip host
   after the password is found
 * added "make uninstall"
diff --git a/hydra-rdp.c b/hydra-rdp.c
index d8eec87..6e9c8db 100644
--- a/hydra-rdp.c
+++ b/hydra-rdp.c
@@ -22,7 +22,10 @@ BOOL rdp_connect(char *server, int32_t port, char *domain, char *login, char *pa
   instance->settings->Username = login;
   instance->settings->Password = password;
   instance->settings->IgnoreCertificate = TRUE;
-  instance->settings->AuthenticationOnly = TRUE;
+  if (password[0] == 0)
+    instance->settings->AuthenticationOnly = FALSE;
+  else
+    instance->settings->AuthenticationOnly = TRUE;
   instance->settings->ServerHostname = server;
   instance->settings->ServerPort = port;
   instance->settings->Domain = domain;