diff --git a/src/templates/base/2019/base_chapter.html b/src/templates/base/2019/base_chapter.html
index e36bf41401b..452e1536375 100644
--- a/src/templates/base/2019/base_chapter.html
+++ b/src/templates/base/2019/base_chapter.html
@@ -87,14 +87,14 @@
 {% macro render_byline() %}
   <div class="byline">{{ self.written_by_before() }}
   {% for author in metadata.get('authors') %}
-  <a class="author" href="{{ url_for('contributors', year=year, lang=lang, _anchor=author) }}">{{ config.contributors[author].name if author in config.contributors else author }}</a>{{ self.comma() if not loop.last }}
+  <a class="author" href="{{ url_for('contributors', year=year, lang=lang, _anchor=author) }}">{{ config.contributors[author].name if author in config.contributors else author }}</a>{{ self.comma() if not loop.last and loop.length > 2 }}
     {% if loop.index == loop.length - 1 %}{{ self.and() }}{% endif %}
   {% endfor %}{{ self.written_by_after() }}
   </div>
 
   <div class="byline reviewers">{{ self.reviewed_by_before() }}
   {% for reviewer in metadata.get('reviewers') %}
-    <a class="reviewer" href="{{ url_for('contributors', year=year, lang=lang, _anchor=reviewer) }}">{{ config.contributors[reviewer].name if reviewer in config.contributors else reviewer }}</a>{{ self.comma() if not loop.last }}
+    <a class="reviewer" href="{{ url_for('contributors', year=year, lang=lang, _anchor=reviewer) }}">{{ config.contributors[reviewer].name if reviewer in config.contributors else reviewer }}</a>{{ self.comma() if not loop.last and loop.length > 2 }}
     {% if loop.index == loop.length - 1 %}{{ self.and() }}{% endif %}
   {% endfor %}{{ self.reviewed_by_after() }}
   </div>
@@ -102,7 +102,7 @@
   {% if metadata.get('translators') | length >= 1 %}
   <div class="byline translators">{{ self.translated_by_before() }}
   {% for translator in metadata.get('translators') %}
-    <a class="translator" href="{{ url_for('contributors', year=year, lang=lang, _anchor=translator) }}">{{ config.contributors[translator].name if translator in config.contributors else translator }}</a>{{ self.comma() if not loop.last }}
+    <a class="translator" href="{{ url_for('contributors', year=year, lang=lang, _anchor=translator) }}">{{ config.contributors[translator].name if translator in config.contributors else translator }}</a>{{ self.comma() if not loop.last and loop.length > 2 }}
     {% if loop.index == loop.length - 1 %}{{ self.and() }}{% endif %}
   {% endfor %}{{ self.translated_by_after() }}
   </div>
diff --git a/src/templates/base/2019/base_ebook.html b/src/templates/base/2019/base_ebook.html
index e4b8f15dbf9..352acaff8fd 100644
--- a/src/templates/base/2019/base_ebook.html
+++ b/src/templates/base/2019/base_ebook.html
@@ -390,7 +390,7 @@ <h1 class="title title-lg">
           {% endif %}
           <div class="contributor-teams">
             {% for id in contributor.teams | sort() %}
-              <span class="contributor-team team-{{ id }}">{{ localizedTeamNames[id] if localizedTeamNames[id]|length else team.name }}</span>{{ self.comma() if not loop.last }}
+              <span class="contributor-team team-{{ id }}">{{ localizedTeamNames[id] if localizedTeamNames[id]|length else team.name }}</span>{{ self.comma() if not loop.last  and loop.length > 2 }}
             {% endfor %}
           </div>
         </div>
diff --git a/src/templates/base/2019/ebook.ejs.html b/src/templates/base/2019/ebook.ejs.html
index 66e81613197..01cb6705e1c 100644
--- a/src/templates/base/2019/ebook.ejs.html
+++ b/src/templates/base/2019/ebook.ejs.html
@@ -35,14 +35,14 @@ <h1 class="title title-lg">
 
             <div class="byline">{{ self.written_by_before() }}
                 {% for author in metadata.get('authors') %}
-                <a class="author" href="#contributors-{{ author }}">{{ config.contributors[author].name if author in config.contributors else author }}</a>{{ self.comma() if not loop.last }}
+                <a class="author" href="#contributors-{{ author }}">{{ config.contributors[author].name if author in config.contributors else author }}</a>{{ self.comma() if not loop.last and loop.length > 2 }}
                 {% if loop.index == loop.length - 1 %}{{ self.and() }}{% endif %}
                 {% endfor %}{{ self.written_by_after() }}
             </div>
             
             <div class="byline reviewers">{{ self.reviewed_by_before() }}
                 {% for reviewer in metadata.get('reviewers') %}
-                <a class="reviewer" href="#contributors-{{ reviewer }}">{{ config.contributors[reviewer].name if reviewer in config.contributors else reviewer }}</a>{{ self.comma() if not loop.last }}
+                <a class="reviewer" href="#contributors-{{ reviewer }}">{{ config.contributors[reviewer].name if reviewer in config.contributors else reviewer }}</a>{{ self.comma() if not loop.last and loop.length > 2 }}
                 {% if loop.index == loop.length - 1 %}{{ self.and() }}{% endif %}
                 {% endfor %}{{ self.reviewed_by_after() }}
             </div>
@@ -50,7 +50,7 @@ <h1 class="title title-lg">
             {% if metadata.get('translators') | length >= 1 %}
             <div class="byline translators">{{ self.translated_by_before() }}
                 {% for translator in metadata.get('translators') %}
-                <a class="translator" href="#contributors-{{ translator }}">{{ config.contributors[translator].name if translator in config.contributors else translator }}</a>{{ self.comma() if not loop.last }}
+                <a class="translator" href="#contributors-{{ translator }}">{{ config.contributors[translator].name if translator in config.contributors else translator }}</a>{{ self.comma() if not loop.last and loop.length > 2 }}
                 {% if loop.index == loop.length - 1 %}{{ self.and() }}{% endif %}
                 {% endfor %}{{ self.translated_by_after() }}
             </div>