diff --git a/src/plone/app/standardtiles/templates/existingcontent_view.pt b/src/plone/app/standardtiles/templates/existingcontent_view.pt
index 9b214c4..b93b65a 100644
--- a/src/plone/app/standardtiles/templates/existingcontent_view.pt
+++ b/src/plone/app/standardtiles/templates/existingcontent_view.pt
@@ -58,7 +58,6 @@
                      dummy python: plone_layout.mark_view(view);
                      portal_url portal_state/portal_url;
                      checkPermission nocall: context/portal_membership/checkPermission;
-                     site_properties context/portal_properties/site_properties;
                      fix python:request.set('ACTUAL_URL', context.absolute_url());
                    ">
                 <div metal:use-macro="item_macro">
diff --git a/src/plone/app/standardtiles/templates/login.pt b/src/plone/app/standardtiles/templates/login.pt
index 3434a08..ecd1822 100644
--- a/src/plone/app/standardtiles/templates/login.pt
+++ b/src/plone/app/standardtiles/templates/login.pt
@@ -72,7 +72,7 @@
             </div>
             <div class="field"
                  tal:define="
-                   use_email_as_login context/portal_properties/site_properties/use_email_as_login|nothing;
+                   use_email_as_login python:context.portal_registry['plone.use_email_as_login'];
                  "
             >
               <tal:loginname condition="not:use_email_as_login">