diff --git a/tos/templates/tos/tos.html b/tos/templates/tos/tos.html
index 18389a6..398a0bb 100644
--- a/tos/templates/tos/tos.html
+++ b/tos/templates/tos/tos.html
@@ -1,3 +1,3 @@
-<h2>Terms of Service as of {{ tos.created|date:"SHORT_DATE_FORMAT }}</h2>
+<h2>Terms of Service as of {{ tos.created|date:"SHORT_DATE_FORMAT" }}</h2>
 
 {{ tos.content }}
\ No newline at end of file
diff --git a/tos/templates/tos/tos_check.html b/tos/templates/tos/tos_check.html
index d5447d1..5bfe7d5 100644
--- a/tos/templates/tos/tos_check.html
+++ b/tos/templates/tos/tos_check.html
@@ -1,7 +1,7 @@
 {% if note %}
     <h2>{{ note }}</note>
 {% else %}
-    <h2>Terms of Service as of {{ tos.created|date:"SHORT_DATE_FORMAT }}</h2>
+    <h2>Terms of Service as of {{ tos.created|date:"SHORT_DATE_FORMAT" }}</h2>
 {% endif %}
 
 {{ tos.content }}
diff --git a/tos/urls.py b/tos/urls.py
index 6030133..73924f8 100644
--- a/tos/urls.py
+++ b/tos/urls.py
@@ -1,6 +1,7 @@
 from django.conf.urls.defaults import * 
 from django.views.generic.simple import direct_to_template
 
+from tos.models import TermsOfService
 from tos.views import check_tos
 
 urlpatterns = patterns('',
@@ -15,7 +16,11 @@ urlpatterns = patterns('',
         url(
             regex   = '^$',
             view    = direct_to_template,
-            kwargs  = {'template': 'tos/tos.html'},            
+            kwargs  = {'template': 'tos/tos.html',
+                        'extra_context':{
+                            'tos':TermsOfService.objects.get_current_tos()
+                            },          
+                        },
             name    = 'tos',
         ),
     )
\ No newline at end of file