diff --git a/scripts/irods/controller.py b/scripts/irods/controller.py
index b4af715357..c8505239fe 100644
--- a/scripts/irods/controller.py
+++ b/scripts/irods/controller.py
@@ -200,7 +200,7 @@ def is_server_listening_for_client_requests(self):
         zone_port = int(self.config.server_config['zone_port'])
 
         with contextlib.closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as s:
-            local_server_host = self.config.client_environment['irods_host']
+            local_server_host = self.config.server_config['host']
 
             if s.connect_ex((local_server_host, zone_port)) == 0:
                 l.debug('Successfully connected to [%s:%s].', local_server_host, zone_port)
diff --git a/scripts/setup_irods.py b/scripts/setup_irods.py
index f9aebef654..63aa91f0f1 100755
--- a/scripts/setup_irods.py
+++ b/scripts/setup_irods.py
@@ -471,7 +471,7 @@ def setup_client_environment(irods_config):
     service_account_dict = {
             'schema_name': 'service_account_environment',
             'schema_version': 'v5',
-            'irods_host': irods.lib.get_hostname(),
+            'irods_host': irods_config.server_config['host'],
             'irods_port': irods_config.server_config['zone_port'],
             'irods_default_resource': irods_config.server_config['default_resource_name'],
             'irods_home': '/'.join(['', irods_config.server_config['zone_name'], 'home', irods_config.server_config['zone_user']]),