diff --git a/client/coral-embed-stream/src/components/Embed.js b/client/coral-embed-stream/src/components/Embed.js
index 63ccc07fe..b7eb6d580 100644
--- a/client/coral-embed-stream/src/components/Embed.js
+++ b/client/coral-embed-stream/src/components/Embed.js
@@ -75,7 +75,7 @@ export default class Embed extends React.Component {
         <AutomaticAssetClosure asset={asset} />
         <IfSlotIsNotEmpty slot="login">
           <Popup
-            href={`embed/login?parentUrl=${encodeURIComponent(parentUrl)}`}
+            href={`login?parentUrl=${encodeURIComponent(parentUrl)}`}
             title="Login"
             features="menubar=0,resizable=0,width=500,height=550,top=200,left=500"
             open={showSignInDialog}
diff --git a/routes/index.js b/routes/index.js
index 48981faff..aa846a9dc 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -74,6 +74,7 @@ router.use(i18n);
 //==============================================================================
 
 router.use('/admin', staticTemplate, require('./admin'));
+router.use('/login', staticTemplate, require('./login'));
 router.use('/embed', staticTemplate, require('./embed'));
 
 //==============================================================================
diff --git a/routes/login/index.js b/routes/login/index.js
new file mode 100644
index 000000000..b69cb7f5c
--- /dev/null
+++ b/routes/login/index.js
@@ -0,0 +1,8 @@
+const express = require('express');
+const router = express.Router();
+
+router.get('*', (req, res) => {
+  res.render('login');
+});
+
+module.exports = router;
diff --git a/views/admin.ejs b/views/admin.ejs
index da689f07f..d93661c78 100644
--- a/views/admin.ejs
+++ b/views/admin.ejs
@@ -34,13 +34,7 @@
         height: 100%;
       }
     </style>
-    <%_ if (locals.customCssUrl) { _%>
-    <link href="<%= customCssUrl %>" rel="stylesheet" type="text/css">
-    <%_ } _%>
-    <% if (data != null) { %>
-    <script id="data" type="application/json"><%- JSON.stringify(data) %></script>
-    <% } %>
-    <base href="<%= BASE_URL %>"/>
+    <%- include partials/head %>
   </head>
   <body class="admin-page">
     <div id="root"></div>
diff --git a/views/embed/stream.ejs b/views/embed/stream.ejs
index dcd84d5f7..aeb87ff92 100644
--- a/views/embed/stream.ejs
+++ b/views/embed/stream.ejs
@@ -6,13 +6,7 @@
     <link rel="stylesheet" type="text/css" href="<%= STATIC_URL %>static/embed/stream/default.css">
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
-    <%_ if (locals.customCssUrl) { _%>
-    <link href="<%= customCssUrl %>" rel="stylesheet" type="text/css">
-    <%_ } _%>
-    <%_ if (data != null) { _%>
-    <script id="data" type="application/json"><%- JSON.stringify(data) %></script>
-    <%_ } _%>
-    <base href="<%= BASE_URL %>"/>
+    <%- include ../partials/head %>
   </head>
   <body class="embed-stream-page">
     <div id="talk-embed-stream-container"></div>
diff --git a/views/embed/login.ejs b/views/login.ejs
similarity index 70%
rename from views/embed/login.ejs
rename to views/login.ejs
index eb6f0578b..d8597bff7 100644
--- a/views/embed/login.ejs
+++ b/views/login.ejs
@@ -6,13 +6,7 @@
     <link rel="stylesheet" type="text/css" href="<%= STATIC_URL %>static/embed/stream/default.css">
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
-    <%_ if (locals.customCssUrl) { _%>
-    <link href="<%= customCssUrl %>" rel="stylesheet" type="text/css">
-    <%_ } _%>
-    <%_ if (data != null) { _%>
-    <script id="data" type="application/json"><%- JSON.stringify(data) %></script>
-    <%_ } _%>
-    <base href="<%= BASE_URL %>"/>
+    <%- include partials/head %>
   </head>
   <body>
     <div id="talk-login-container"></div>
diff --git a/views/partials/head.ejs b/views/partials/head.ejs
new file mode 100644
index 000000000..d9d1b423e
--- /dev/null
+++ b/views/partials/head.ejs
@@ -0,0 +1,7 @@
+<%_ if (locals.customCssUrl) { _%>
+<link href="<%= customCssUrl %>" rel="stylesheet" type="text/css">
+<%_ } _%>
+<%_ if (data != null) { _%>
+<script id="data" type="application/json"><%- JSON.stringify(data) %></script>
+<%_ } _%>
+<base href="<%= BASE_URL %>"/>
\ No newline at end of file
