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.20 -r1.78.2.21
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	30 Aug 2016 11:01:40 -0000	1.78.2.20
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	2 Sep 2016 17:33:19 -0000	1.78.2.21
@@ -626,9 +626,12 @@
                                      -parameter UseHostnameDomainforReg \
                                      -default 0]
     if { $UseHostnameDomainforReg } {
-
-        # Get config.tcl's hostname
-        set config_hostname [ns_config [ns_driversection] hostname]
+        #
+        # Get the configured hostname from the NaviServer/AOLserver
+        # config file (config.tcl) either from nssock or from the
+        # https driver.
+        #
+        set config_hostname [dict get [util_driver_info] hostname] 
         
         set current_location [util_current_location]
         util::split_location $current_location currentProto currentHost currentPort
@@ -745,7 +748,7 @@
                                 where host = :hostname
                             }
                             set subsiteUrl [site_node::get_url -node_id ${host_node_id} -notrailing]
-                            set rUrl [util::join_location -proto $returnProto -hostname ${config_hostname} -port $returnPort]
+                            set rUrl [util::join_location -proto $returnProto -hostname $config_hostname -port $returnPort]
                             append rUrl $subsiteUrl $restUrl
                             set return_url_decoded $rUrl
                             # no need to iterate over all entries of host-node map