Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -r1.78.2.60 -r1.78.2.61
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	31 May 2017 11:48:36 -0000	1.78.2.60
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	28 Jun 2017 20:40:30 -0000	1.78.2.61
@@ -830,6 +830,9 @@
             set return_url [ad_return_url -qualified]
         }
     }
+    if {$host_node_id == 0} {
+        unset host_node_id
+    }
     set url [export_vars -base $url -no_empty {authority_id username return_url host_node_id}]
 
     ns_log $::security::log(login_url) "ad_get_login_url: final login_url <$url>"