diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..527732638
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Declare files that must always have LF line endings on checkout so docker compose works on Windows
+*   eol=lf
diff --git a/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html b/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html
index 77d19456b..5fccc16e9 100644
--- a/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html
+++ b/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html
@@ -34,7 +34,7 @@
 
       <div>
         {% if minimal_outside_links != 'True' %}
-          <a class="brand-logo" style='background: transparent url("{{pathto('_static/img/logo_small.png', 1)}}") no-repeat 0px 0px;' href="/{{appname}}/default/user/login">&nbsp; </a>
+          <a class="brand-logo" style='background: transparent url("{{pathto('_static/img/logo_small.png', 1)}}") no-repeat 0px 0px;' href="/{{appname}}/default/frontpage">&nbsp; </a>
         {% else %}
           <a class="brand-logo" style='background: transparent url("{{pathto('_static/img/logo_small.png', 1)}}") no-repeat 0px 0px;'>&nbsp;<span aria-label="logo" class="visuallyhidden">Runestone Logo</span> </a>
         {% endif %}
@@ -151,7 +151,7 @@
             {% if minimal_outside_links != 'True' %}
             <li><a href="/{{appname}}/default/user/profile" id="profilelink">Edit Profile</a></li>
             <li><a href="/{{appname}}/default/user/change_password" id="passwordlink">Change Password</a></li>
-            <li><a href="/{{appname}}/default/user/register" id="registerlink">Register</a></li>
+            <li><a href="/{{appname}}/default/frontpage/register" id="registerlink">Register</a></li>
             {% endif %}
             <li class='loginout'><a href='#'>Login</a></li> <!-- correct link populated by addNavbarLoginLink() -->
 			<!-- dark mode toggle -->