diff --git a/webapp/web/css/login.css b/webapp/web/css/login.css
index 8c43c4fed..ff45f7884 100644
--- a/webapp/web/css/login.css
+++ b/webapp/web/css/login.css
@@ -8,7 +8,7 @@
   text-align:left;
 }
 
-.noOutterBox {
+.noOuterBox {
   width:340px;
   padding:0px;
   border: none;
diff --git a/webapp/web/templates/freemarker/body/home.ftl b/webapp/web/templates/freemarker/body/home.ftl
index 4965d4a9e..538080d2d 100644
--- a/webapp/web/templates/freemarker/body/home.ftl
+++ b/webapp/web/templates/freemarker/body/home.ftl
@@ -1,5 +1,9 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#-- Template for home page body contents -->
+<#-- Template for home page body contents. This file is deliberately empty, for use by themes that define a full
+page template for the home page and do not use a separate body template. The HomePageController defines a 
+body template, for those themes that do not use a distinct page template for the home page, so that they
+can provide the home page body content. The default empty template is defined so Freemarker doesn't throw an error
+when it tries to get the template. (Or should we just let Freemarker log an error? It doesn't prevent the page
+from displaying.) -->
 
-<p>This is the Vitro home page.</p>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/page/page-home.ftl b/webapp/web/templates/freemarker/page/page-home.ftl
new file mode 100644
index 000000000..60e4b87bf
--- /dev/null
+++ b/webapp/web/templates/freemarker/page/page-home.ftl
@@ -0,0 +1,5 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Page template for home page, for themes that do not use a home-page specific layout. -->
+
+<#include "page.ftl">
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/widgets/widget-login.ftl b/webapp/web/templates/freemarker/widgets/widget-login.ftl
new file mode 100644
index 000000000..9a64d980d
--- /dev/null
+++ b/webapp/web/templates/freemarker/widgets/widget-login.ftl
@@ -0,0 +1,49 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Login widget -->
+
+<#-- Question for Nick and Manolo: can we use this in Vitro, where html 5 is not being used, or should it be moved
+to the wilma theme? Please do whatever's appropriate. -->
+
+<#macro styles>
+    <#if ! loginName??>
+        ${stylesheets.add("/css/login.css")}
+    </#if>
+</#macro>
+
+<#macro scripts>
+    <#if ! loginName??>
+        <#-- define any js files needed for the login widget -->
+    </#if>
+</#macro>
+
+<#macro markup>
+    <#if ! loginName??>    
+        <section id="log-in">
+            <h3>Log in</h3>
+            
+            <form id="log-in-form" action="${urls.home}/authenticate?login=block" method="post" name="log-in-form" />
+                <label for="loginName">Email</label>
+                <div class="input-field">
+                    <input name="loginName" id="loginName" type="text" required />
+                </div>
+                <label for="loginPassword">Password</label>
+                <div class="input-field">
+                    <input name="loginPassword" id="loginPassword" type="password" required />
+                </div>
+                <div id="wrapper-submit-remember-me">
+                    <input name="loginForm"  type="submit" class="login green button" value="Log in"/>
+                    <div id="remember-me">
+                        <input class="checkbox-remember-me" name="remember-me" type="checkbox" value="" />
+                        <label class="label-remember-me"for="remember-me">Remember me</label>
+                    </div>
+                </div>
+                <p class="forgot-password"><a href="#">Forgot your password?</a></p>
+            </form>
+            
+            <div id="request-account">
+                <a class="blue button" href="#">Request an account</a>
+            </div>
+        </section> <!-- #log-in -->
+    </#if>
+</#macro>