diff --git a/environments/common/inventory/group_vars/all/openondemand.yml b/environments/common/inventory/group_vars/all/openondemand.yml
index 4337e0d89..a309fc31f 100644
--- a/environments/common/inventory/group_vars/all/openondemand.yml
+++ b/environments/common/inventory/group_vars/all/openondemand.yml
@@ -34,7 +34,8 @@ openondemand_dashboard_links_grafana:
     url: "{{ grafana_url_openondemand_proxy }}"
 openondemand_dashboard_links: "{{ openondemand_dashboard_links_grafana if groups['grafana'] | length > 0 }}"
 
-openondemand_login_host: localhost
+# For FreeIPA-enroled hosts, the shell host must be an IPA-registered host to avoid an ssh key prompt
+openondemand_login_host: "{{ inventory_hostname if inventory_hostname in groups['freeipa_client'] else 'localhost' }}"
 
 openondemand_clusters:
   slurm: