diff --git a/ietf/templates/wgchairs/notexistdelegate.html b/ietf/templates/wgchairs/notexistdelegate.html
index 3a7fa6482..706907022 100644
--- a/ietf/templates/wgchairs/notexistdelegate.html
+++ b/ietf/templates/wgchairs/notexistdelegate.html
@@ -1,10 +1,26 @@
+{% if shepherd %}
+<p>
+The shepherd you are trying to designate does not have a personal user-id and password to log-on to the Datatracker.
+</p>
+<p>
+An email will be sent to the following addresses to inform that
+the person you have designated to be one of your document shepherds
+currently does not have login credentials for the Datatracker
+and should contact the Secretariat to obtain their own user-id and
+password for the Datatracker.
+</p>
+{% else %}
 <p>
 The delegate you are trying to designate does not have a personal user-id and password to log-on to the Datatracker.
 </p>
 <p>
-An email will be sent to the following address to inform that the person designated sould contact with the Secretariat
-to obtain their own user-id and password to the Datatracker.
+An email will be sent to the following addresses to inform that
+the person you have designated to be one of your delegates
+currently does not have login credentials for the Datatracker
+and should contact the Secretariat to obtain their own user-id and
+password for the Datatracker.
 </p>
+{% endif %}
 <ul>
 {% for email in email_list %}
 <li>{{ email }}</li>
diff --git a/ietf/wgchairs/forms.py b/ietf/wgchairs/forms.py
index 722101212..7aca1291c 100644
--- a/ietf/wgchairs/forms.py
+++ b/ietf/wgchairs/forms.py
@@ -278,7 +278,7 @@ class NotExistDelegateForm(MultipleDelegateForm):
 
     def as_p(self):
         email_list = self.get_email_list()
-        info = render_to_string('wgchairs/notexistdelegate.html', {'email_list': email_list})
+        info = render_to_string('wgchairs/notexistdelegate.html', {'email_list': email_list, 'shepherd': self.shepherd})
         return info + super(NotExistDelegateForm, self).as_p()
 
     def send_email(self, email, template):