diff --git a/service/templates/authorize.html b/service/templates/authorize.html
index 2ae2eb2..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>
@@ -50,6 +43,7 @@ <h1>
       </label>
     </div>
   </form>
+  {% include "./content_footer.html" %}
 </main>
 {% endblock %}
 
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/content_footer.html b/service/templates/content_footer.html
new file mode 100644
index 0000000..be18ac8
--- /dev/null
+++ b/service/templates/content_footer.html
@@ -0,0 +1,21 @@
+<style>
+  .powered_by {
+    /* To move non-image links to the left */
+    margin-left: auto;
+  }
+</style>
+<footer>
+  <a href="https://tacc.utexas.edu/about/security-and-compliance/">
+    Security
+  </a>
+  <a href="https://tacc.utexas.edu/use-tacc/user-policies/">
+    Policies
+  </a>
+  {% if client_display_name == "TACC User Portal" %}
+  <a href="https://tapis-project.org" target="_blank" class="powered_by">
+    Powered by:
+    <img src="https://dev.develop.tapis.io/v3/oauth2/authorize/tapis.png"
+      alt="Tapis logo" title="Tapis (TACC APIs)" height="50px">
+  </a>
+  {% endif %}
+</footer>
diff --git a/service/templates/device-code.html b/service/templates/device-code.html
index 79c74d5..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>
 
@@ -35,5 +28,6 @@ <h1>
       <button type="submit">Submit</button>
     </footer>
   </form>
+  {% include "./content_footer.html" %}
 </main>
 {% endblock %}
diff --git a/service/templates/login.html b/service/templates/login.html
index 23f86ad..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>
@@ -61,14 +54,7 @@ <h1>
       {% endif %}
     </nav>
   </form>
-  <footer>
-    <a href="https://tacc.utexas.edu/about/security-and-compliance/">
-      Security
-    </a>
-    <a href="https://tacc.utexas.edu/use-tacc/user-policies/">
-      Policies
-    </a>
-  </footer>
+  {% include "./content_footer.html" %}
 </main>
 {% endblock %}
 
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 8b66185..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>
 
@@ -47,6 +40,7 @@ <h1>
          <button type="submit" name="action" value="submit">Submit</button>
       </footer>
    </form>
+  {% include "./content_footer.html" %}
 </main>
 {% endblock %}
 
diff --git a/service/templates/select_idp.html b/service/templates/select_idp.html
index 05d595d..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>
@@ -42,14 +35,7 @@ <h1>
     </nav>
 
  </form>
- <footer>
-   <a href="https://tacc.utexas.edu/about/security-and-compliance/">
-     Security
-   </a>
-   <a href="https://tacc.utexas.edu/use-tacc/user-policies/">
-     Policies
-   </a>
- </footer>
+  {% include "./content_footer.html" %}
 
 </main>
 {% endblock %}
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 d0d4643..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>
 
@@ -36,6 +29,7 @@ <h1>
       <input type="hidden" name="client_state" value="{{ client_state }}">
 
    </form>
+   {% include "./content_footer.html" %}
 </main>
 
 {% endblock %}
\ No newline at end of file