diff --git a/templates/identity/email-password/confirm.html.ejs b/templates/identity/email-password/confirm.html.ejs
index 49a29ad74..e6862f55e 100644
--- a/templates/identity/email-password/confirm.html.ejs
+++ b/templates/identity/email-password/confirm.html.ejs
@@ -8,7 +8,7 @@
 </head>
 <body>
   <header>
-    <img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" />
+    <a href="/"><img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" /></a>
     <h1>Community Solid Server</h1>
   </header>
   <main>
@@ -18,7 +18,10 @@
     </form>
   </main>
   <footer>
-    <p>©2019–2021 Inrupt Inc. and imec</p>
+    <p>
+      ©2019–2021 <a href="https://inrupt.com/">Inrupt Inc.</a>
+      and <a href="https://www.imec-int.com/">imec</a>
+    </p>
   </footer>
 </body>
 </html>
diff --git a/templates/identity/email-password/email-sent.html.ejs b/templates/identity/email-password/email-sent.html.ejs
index bbda0f691..748f6e743 100644
--- a/templates/identity/email-password/email-sent.html.ejs
+++ b/templates/identity/email-password/email-sent.html.ejs
@@ -8,7 +8,7 @@
 </head>
 <body>
   <header>
-    <img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" />
+    <a href="/"><img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" /></a>
     <h1>Community Solid Server</h1>
   </header>
   <main>
@@ -28,7 +28,10 @@
     </form>
   </main>
   <footer>
-    <p>©2019–2021 Inrupt Inc. and imec</p>
+    <p>
+      ©2019–2021 <a href="https://inrupt.com/">Inrupt Inc.</a>
+      and <a href="https://www.imec-int.com/">imec</a>
+    </p>
   </footer>
 </body>
 </html>
diff --git a/templates/identity/email-password/forgot-password.html.ejs b/templates/identity/email-password/forgot-password.html.ejs
index 7712d0ba1..08288989d 100644
--- a/templates/identity/email-password/forgot-password.html.ejs
+++ b/templates/identity/email-password/forgot-password.html.ejs
@@ -8,7 +8,7 @@
 </head>
 <body>
   <header>
-    <img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" />
+    <a href="/"><img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" /></a>
     <h1>Community Solid Server</h1>
   </header>
   <main>
@@ -33,7 +33,10 @@
     </form>
   </main>
   <footer>
-    <p>©2019–2021 Inrupt Inc. and imec</p>
+    <p>
+      ©2019–2021 <a href="https://inrupt.com/">Inrupt Inc.</a>
+      and <a href="https://www.imec-int.com/">imec</a>
+    </p>
   </footer>
 </body>
 </html>
diff --git a/templates/identity/email-password/login.html.ejs b/templates/identity/email-password/login.html.ejs
index 1614099a8..3588e4146 100644
--- a/templates/identity/email-password/login.html.ejs
+++ b/templates/identity/email-password/login.html.ejs
@@ -8,7 +8,7 @@
 </head>
 <body>
   <header>
-    <img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" />
+    <a href="/"><img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" /></a>
     <h1>Community Solid Server</h1>
   </header>
   <main>
@@ -43,7 +43,10 @@
     </form>
   </main>
   <footer>
-    <p>©2019–2021 Inrupt Inc. and imec</p>
+    <p>
+      ©2019–2021 <a href="https://inrupt.com/">Inrupt Inc.</a>
+      and <a href="https://www.imec-int.com/">imec</a>
+    </p>
   </footer>
 </body>
 </html>
diff --git a/templates/identity/email-password/message.html.ejs b/templates/identity/email-password/message.html.ejs
index e8a0145b1..2ee0240f8 100644
--- a/templates/identity/email-password/message.html.ejs
+++ b/templates/identity/email-password/message.html.ejs
@@ -8,14 +8,17 @@
 </head>
 <body>
   <header>
-    <img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" />
+    <a href="/"><img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" /></a>
     <h1>Community Solid Server</h1>
   </header>
   <main>
     <p><%= message %></p>
   </main>
   <footer>
-    <p>©2019–2021 Inrupt Inc. and imec</p>
+    <p>
+      ©2019–2021 <a href="https://inrupt.com/">Inrupt Inc.</a>
+      and <a href="https://www.imec-int.com/">imec</a>
+    </p>
   </footer>
 </body>
 </html>
diff --git a/templates/identity/email-password/register-response.html.ejs b/templates/identity/email-password/register-response.html.ejs
index 239331e96..44401194e 100644
--- a/templates/identity/email-password/register-response.html.ejs
+++ b/templates/identity/email-password/register-response.html.ejs
@@ -8,7 +8,7 @@
 </head>
 <body>
   <header>
-    <img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" />
+    <a href="/"><img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" /></a>
     <h1>Community Solid Server</h1>
   </header>
   <main>
@@ -39,7 +39,10 @@
     <% } %>
   </main>
   <footer>
-    <p>©2019–2021 Inrupt Inc. and imec</p>
+    <p>
+      ©2019–2021 <a href="https://inrupt.com/">Inrupt Inc.</a>
+      and <a href="https://www.imec-int.com/">imec</a>
+    </p>
   </footer>
 </body>
 </html>
diff --git a/templates/identity/email-password/register.html.ejs b/templates/identity/email-password/register.html.ejs
index 9d3627b31..448ac5bf6 100644
--- a/templates/identity/email-password/register.html.ejs
+++ b/templates/identity/email-password/register.html.ejs
@@ -8,7 +8,7 @@
 </head>
 <body>
   <header>
-    <img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" />
+    <a href="/"><img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" /></a>
     <h1>Community Solid Server</h1>
   </header>
   <main>
@@ -66,7 +66,10 @@
     </form>
   </main>
   <footer>
-    <p>©2019–2021 Inrupt Inc. and imec</p>
+    <p>
+      ©2019–2021 <a href="https://inrupt.com/">Inrupt Inc.</a>
+      and <a href="https://www.imec-int.com/">imec</a>
+    </p>
   </footer>
 </body>
 </html>
diff --git a/templates/identity/email-password/reset-password.html.ejs b/templates/identity/email-password/reset-password.html.ejs
index d7c3b2b07..3ebcada86 100644
--- a/templates/identity/email-password/reset-password.html.ejs
+++ b/templates/identity/email-password/reset-password.html.ejs
@@ -8,7 +8,7 @@
 </head>
 <body>
   <header>
-    <img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" />
+    <a href="/"><img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" /></a>
     <h1>Community Solid Server</h1>
   </header>
   <main>
@@ -37,7 +37,10 @@
     </form>
   </main>
   <footer>
-    <p>©2019–2021 Inrupt Inc. and imec</p>
+    <p>
+      ©2019–2021 <a href="https://inrupt.com/">Inrupt Inc.</a>
+      and <a href="https://www.imec-int.com/">imec</a>
+    </p>
   </footer>
 </body>
 </html>
diff --git a/templates/main.html.hbs b/templates/main.html.hbs
index 4ae9dbc66..d9c68bae3 100644
--- a/templates/main.html.hbs
+++ b/templates/main.html.hbs
@@ -10,14 +10,17 @@
 </head>
 <body>
   <header>
-    <img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" />
+    <a href="/"><img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" /></a>
     <h1>Community Solid Server</h1>
   </header>
   <main>
     {{{ htmlBody }}}
   </main>
   <footer>
-    <p>©2019–2021 Inrupt Inc. and imec</p>
+    <p>
+      ©2019–2021 <a href="https://inrupt.com/">Inrupt Inc.</a>
+      and <a href="https://www.imec-int.com/">imec</a>
+    </p>
   </footer>
 </body>
 </html>
diff --git a/templates/root/index.html b/templates/root/index.html
index ddadec833..2611592c2 100644
--- a/templates/root/index.html
+++ b/templates/root/index.html
@@ -8,7 +8,7 @@
 </head>
 <body>
   <header>
-    <img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" />
+    <a href="/"><img src="/.well_known/css/images/solid.svg" alt="[Solid logo]" /></a>
     <h1>Community Solid Server</h1>
   </header>
   <main>
@@ -37,7 +37,10 @@
     </ul>
   </main>
   <footer>
-    <p>©2019–2021 Inrupt Inc. and imec</p>
+    <p>
+      ©2019–2021 <a href="https://inrupt.com/">Inrupt Inc.</a>
+      and <a href="https://www.imec-int.com/">imec</a>
+    </p>
   </footer>
 </body>
 </html>
diff --git a/templates/styles/main.css b/templates/styles/main.css
index 00b9f7a67..bd089bf64 100644
--- a/templates/styles/main.css
+++ b/templates/styles/main.css
@@ -87,6 +87,10 @@ a {
 a:hover {
   color: var(--solid-blue);
 }
+footer a {
+  color: inherit;
+  font-weight: inherit;
+}
 
 code {
   font-size: 90%;
