diff --git a/lib/ansible/playbook/play_context.py b/lib/ansible/playbook/play_context.py
index 669584b051..d02fb42794 100644
--- a/lib/ansible/playbook/play_context.py
+++ b/lib/ansible/playbook/play_context.py
@@ -352,6 +352,8 @@ class PlayContext(Base):
             # and likewise for the remote user
             for user_var in ('ansible_%s_user' % delegated_transport,) + C.MAGIC_VARIABLE_MAPPING.get('remote_user'):
                 if user_var in delegated_vars and delegated_vars[user_var]:
+                    if user_var != 'ansible_user':
+                        delegated_vars['ansible_user'] = delegated_vars[user_var]
                     break
             else:
                 delegated_vars['ansible_user'] = task.remote_user or self.remote_user