diff --git a/service/templates/authorize.html b/service/templates/authorize.html
index 315b0b8..66db61d 100644
--- a/service/templates/authorize.html
+++ b/service/templates/authorize.html
@@ -4,14 +4,7 @@
 <main class="s-form-page">
   <form action="" method="post" id="auth-form" class="s-form s-form--login">
     <h1>
-      <figure>
-      {% with tenant_id=tenant_id %}
-        {% include "./branding.html" %}
-      {% endwith %}
-      {% with tenant_id="tacc" %}
-        {% include "./branding.html" %}
-      {% endwith %}
-      </figure>
+      {% include "./content_figure.html" %}
       <span>Connect to Tapis</span>
     </h1>
     <p>The <var>{{ client_display_name }}</var> wants to use <a href="https://tapis-project.org/" target="_blank">Tapis</a> (TACC APIs) service to grant actions on behalf of <var>{{ username }}</var>.</p>
diff --git a/service/templates/content_figure.html b/service/templates/content_figure.html
new file mode 100644
index 0000000..58fa3cf
--- /dev/null
+++ b/service/templates/content_figure.html
@@ -0,0 +1,10 @@
+<figure>
+  {% if client_display_name != "TACC User Portal" %}
+    {% with tenant_id=tenant_id %}
+      {% include "./branding.html" %}
+    {% endwith %}
+  {% endif %}
+  {% with tenant_id="tacc" %}
+    {% include "./branding.html" %}
+  {% endwith %}
+</figure>
diff --git a/service/templates/device-code.html b/service/templates/device-code.html
index c03ba6b..e48eaa3 100644
--- a/service/templates/device-code.html
+++ b/service/templates/device-code.html
@@ -4,14 +4,7 @@
 <main class="s-form-page">
   <form action="" method="post" class="s-form s-form--login">
     <h1>
-      <figure>
-      {% with tenant_id=tenant_id %}
-      {% include "./branding.html" %}
-      {% endwith %}
-      {% with tenant_id="tacc" %}
-      {% include "./branding.html" %}
-      {% endwith %}
-      </figure>
+      {% include "./content_figure.html" %}
       <span>Enter User Code</span>
     </h1>
 
diff --git a/service/templates/login.html b/service/templates/login.html
index 9ff05a8..763c71c 100644
--- a/service/templates/login.html
+++ b/service/templates/login.html
@@ -4,14 +4,7 @@
 <main class="s-form-page">
   <form action="" method="post" class="s-form s-form--login">
     <h1>
-      <figure>
-        {% with tenant_id=tenant_id %}
-        {% include "./branding.html" %}
-        {% endwith %}
-        {% with tenant_id="tacc" %}
-        {% include "./branding.html" %}
-        {% endwith %}
-      </figure>
+      {% include "./content_figure.html" %}
       <span>Log In</span>
     </h1>
     <p>to continue to the <var>{{ client_display_name }}</var></p>
diff --git a/service/templates/logout.html b/service/templates/logout.html
index 1023cd2..e41beb2 100644
--- a/service/templates/logout.html
+++ b/service/templates/logout.html
@@ -4,14 +4,7 @@
 <main class="s-form-page">
   <form action="" method="post" class="s-form s-form--login">
     <h1>
-      <figure>
-      {% with tenant_id=tenant_id %}
-      {% include "./branding.html" %}
-      {% endwith %}
-      {% with tenant_id="tacc" %}
-      {% include "./branding.html" %}
-      {% endwith %}
-      </figure>
+      {% include "./content_figure.html" %}
     </h1>
 
     {% if logout_message %}
diff --git a/service/templates/mfa.html b/service/templates/mfa.html
index 2aefe17..3df465c 100644
--- a/service/templates/mfa.html
+++ b/service/templates/mfa.html
@@ -4,14 +4,7 @@
 <main class="s-form-page">
    <form action="" method="post" class="s-form s-form--login">
       <h1>
-         <figure>
-         {% with tenant_id=tenant_id %}
-         {% include "./branding.html" %}
-         {% endwith %}
-         {% with tenant_id="tacc" %}
-         {% include "./branding.html" %}
-         {% endwith %}
-         </figure>
+         {% include "./content_figure.html" %}
          <span>Enter MFA Token</span>
       </h1>
 
diff --git a/service/templates/select_idp.html b/service/templates/select_idp.html
index ee27d2b..3896f42 100644
--- a/service/templates/select_idp.html
+++ b/service/templates/select_idp.html
@@ -4,14 +4,7 @@
 <main class="s-form-page">
  <form action="" method="post" class="s-form s-form--login">   
    <h1>
-      <figure>
-      {% with tenant_id=tenant_id %}
-        {% include "./branding.html" %}
-      {% endwith %}
-      {% with tenant_id="tacc" %}
-        {% include "./branding.html" %}
-      {% endwith %}
-      </figure>
+      {% include "./content_figure.html" %}
       <span>Log in to Tapis</span>
     </h1>
     <p>Select an account to continue</p>
diff --git a/service/templates/success.html b/service/templates/success.html
index a5f1a5e..f607fe2 100644
--- a/service/templates/success.html
+++ b/service/templates/success.html
@@ -4,14 +4,7 @@
 <main class="s-form-page">
     <form action="" method="post" class="s-form s-form--login">
       <h1>
-        <figure>
-        {% with tenant_id=tenant_id %}
-        {% include "./branding.html" %}
-        {% endwith %}
-        {% with tenant_id="tacc" %}
-        {% include "./branding.html" %}
-        {% endwith %}
-        </figure>
+        {% include "./content_figure.html" %}
         <span>Congrats! Device Code entered successfully. Please return to your application</span>
       </h1>
   
diff --git a/service/templates/tenant.html b/service/templates/tenant.html
index 56fd911..486bebc 100644
--- a/service/templates/tenant.html
+++ b/service/templates/tenant.html
@@ -4,14 +4,7 @@
 <main class="s-form-page">
    <form action="" method="post" class="s-form s-form--login">
       <h1>
-         <figure>
-            {% with tenant_id=tenant_id %}
-            {% include "./branding.html" %}
-            {% endwith %}
-            {% with tenant_id="tacc" %}
-            {% include "./branding.html" %}
-            {% endwith %}
-         </figure>
+         {% include "./content_figure.html" %}
          <span>Tapis Tenant</span>
       </h1>