diff --git a/webclient/home/home.html b/webclient/home/home.html
index 8d35eb5157..c1f9643839 100644
--- a/webclient/home/home.html
+++ b/webclient/home/home.html
@@ -3,7 +3,7 @@
     <div id="wrapper">
     
     <div id="genericHeading">
-        <img src="img/logo-small.png" width="100" height="43" alt="[matrix]"/>
+        <a href ng-click="goToPage('/')"><img src="img/logo-small.png" width="100" height="43" alt="[matrix]"/></a>
     </div>
     
     <h1>Welcome to homeserver {{ config.homeserver }}</h1>
diff --git a/webclient/login/login.html b/webclient/login/login.html
index 8d5a53ebbc..18e7a02815 100644
--- a/webclient/login/login.html
+++ b/webclient/login/login.html
@@ -1,7 +1,7 @@
 <div ng-controller="LoginController" class="login">    
     <div id="wrapper" class="loginWrapper">
         
-        <a href ng-click="goToPage('/login')">
+        <a href ng-click="goToPage('/')">
         <img src="img/logo.png" width="240" height="102" alt="[matrix]" style="padding: 50px"/>
         </a>
     
diff --git a/webclient/login/register.html b/webclient/login/register.html
index 85efa56414..1b470e4554 100644
--- a/webclient/login/register.html
+++ b/webclient/login/register.html
@@ -1,8 +1,8 @@
 <div ng-controller="RegisterController" class="register">
     <div id="wrapper" class="loginWrapper">
 
-        <a href ng-click="goToPage('/login')">
-        <img src="img/logo.png" width="240" height="102" alt="[matrix]" style="padding: 50px"/>
+        <a href ng-click="goToPage('/')">
+            <img src="img/logo.png" width="240" height="102" alt="[matrix]" style="padding: 50px"/>
         </a>
         <br/>
 
diff --git a/webclient/room/room.html b/webclient/room/room.html
index 19b112d009..e5e454864b 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -1,7 +1,7 @@
 <div ng-controller="RoomController" data-ng-init="onInit()" class="room" style="height: 100%;">
 
     <div id="roomHeader">
-        <img src="img/logo-small.png" width="100" height="43" alt="[matrix]"/>
+        <a href ng-click="goToPage('/')"><img src="img/logo-small.png" width="100" height="43" alt="[matrix]"/></a>
         <div id="roomName">
             {{ room_alias || room_id }}
         </div>
diff --git a/webclient/settings/settings.html b/webclient/settings/settings.html
index 0ba3fe263a..a69a8de300 100644
--- a/webclient/settings/settings.html
+++ b/webclient/settings/settings.html
@@ -3,7 +3,7 @@
     <div id="wrapper">
 
         <div id="genericHeading">
-            <img src="img/logo-small.png" width="100" height="43" alt="[matrix]"/>
+            <a href ng-click="goToPage('/')"><img src="img/logo-small.png" width="100" height="43" alt="[matrix]"/></a>
         </div>
 
         <h1>Settings</h1>
diff --git a/webclient/user/user.html b/webclient/user/user.html
index 3574403c87..2aa981437b 100644
--- a/webclient/user/user.html
+++ b/webclient/user/user.html
@@ -3,7 +3,7 @@
     <div id="wrapper">
 
         <div id="genericHeading">
-            <img src="img/logo-small.png" width="100" height="43" alt="[matrix]"/>
+            <a href ng-click="goToPage('/')"><img src="img/logo-small.png" width="100" height="43" alt="[matrix]"/></a>
         </div>
 
         <h1>{{ user.displayname || user.id }}</h1>