diff --git a/jsapp/scss/stylesheets/partials/_registration.scss b/jsapp/scss/stylesheets/partials/_registration.scss
index d192b8a735..8ef58aba48 100644
--- a/jsapp/scss/stylesheets/partials/_registration.scss
+++ b/jsapp/scss/stylesheets/partials/_registration.scss
@@ -331,7 +331,7 @@ form.registration--login > p > span.helptext{
 }
 
 .registration__create-or-forgot {
-  margin: 20px 0;
+  margin: 20px 0 0;
   display: flex;
   flex-direction: row;
   justify-content: space-between;
@@ -339,28 +339,39 @@ form.registration--login > p > span.helptext{
   gap: 10px;
 }
 
+.registration__legal {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  flex-wrap: wrap;
+  gap: 20px;
+}
+
+.registration__legal::before {
+  content: '';
+  display: block;
+  width: 100%;
+  margin-top: 20px;
+  border-top: 1px solid colors.$kobo-light-storm;
+  opacity: 0.4;
+}
+
+.registration__legal a {
+  text-decoration: none !important;
+  font-size: 14px;
+  opacity: 0.75;
+}
+
+.registration__legal a:hover {
+  text-decoration: underline !important;
+  opacity: 1;
+}
+
 .registration__footer {
   clear: both;
   text-align: center;
-  margin: 20px 10px 10px 10px;
   text-shadow: colors.$kobo-gray-900 0 0 2px; // contrast against photo background
-
-  a {
-    color: colors.$kobo-white;
-
-    &:hover {
-      color: colors.$kobo-light-storm;
-    }
-  }
-
-  .registration__legal {
-    margin: 0 20px;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    flex-wrap: wrap;
-    gap: 20px;
-  }
 }
 
 .error-message {
diff --git a/kobo/apps/accounts/templates/account/login.html b/kobo/apps/accounts/templates/account/login.html
index f18f3ffa23..500548580b 100644
--- a/kobo/apps/accounts/templates/account/login.html
+++ b/kobo/apps/accounts/templates/account/login.html
@@ -73,6 +73,17 @@ <h2>{% trans "Log in using SSO" %}</h2>
       </div>
       <script src="{% static 'js/sso_buttons.js' %}"></script>
     {% endif %}
-
+    <div class="registration__legal">
+      {% if config.TERMS_OF_SERVICE_URL %}
+        <a href="{{config.TERMS_OF_SERVICE_URL}}" target="_blank">
+          {% trans "Terms of Service" %}
+        </a>
+      {% endif %}
+      {% if config.PRIVACY_POLICY_URL %}
+        <a href="{{config.PRIVACY_POLICY_URL}}" target="_blank">
+          {% trans "Privacy Policy" %}
+        </a>
+      {% endif %}
+    </div>
   </form>
 {% endblock %}
diff --git a/kobo/apps/accounts/templates/account/signup.html b/kobo/apps/accounts/templates/account/signup.html
index cb5dcfae6d..fe248652a8 100644
--- a/kobo/apps/accounts/templates/account/signup.html
+++ b/kobo/apps/accounts/templates/account/signup.html
@@ -90,5 +90,18 @@ <h2>{% trans "Register using SSO" %}</h2>
       {% endif %}
   </div>
   <div style="clear:both;"></div>
+  <div class="registration__legal">
+    {% if config.TERMS_OF_SERVICE_URL %}
+      <a href="{{config.TERMS_OF_SERVICE_URL}}" target="_blank">
+        {% trans "Terms of Service" %}
+      </a>
+    {% endif %}
+    {% if config.PRIVACY_POLICY_URL %}
+      <a href="{{config.PRIVACY_POLICY_URL}}" target="_blank">
+        {% trans "Privacy Policy" %}
+      </a>
+    {% endif %}
+  </div>
+</div>
 </form>
 {% endblock %}
diff --git a/kpi/templates/base.html b/kpi/templates/base.html
index 881c87d801..77e0d05193 100644
--- a/kpi/templates/base.html
+++ b/kpi/templates/base.html
@@ -23,19 +23,6 @@
     {% endif %}
 
     <div class="registration__footer">
-      <div class="registration__legal">
-        {% if config.TERMS_OF_SERVICE_URL %}
-          <a href="{{config.TERMS_OF_SERVICE_URL}}" target="_blank">
-            {% trans "Terms of Service" %}
-          </a>
-        {% endif %}
-        {% if config.PRIVACY_POLICY_URL %}
-          <a href="{{config.PRIVACY_POLICY_URL}}" target="_blank">
-            {% trans "Privacy Policy" %}
-          </a>
-        {% endif %}
-      </div>
-
       {% block background_credit %}
         {{ block.super }}
       {% endblock %}