diff --git a/tos/models.py b/tos/models.py
index e166a03..6bb5f2e 100644
--- a/tos/models.py
+++ b/tos/models.py
@@ -17,8 +17,8 @@ class TermsOfServiceManager(models.Manager):
     
     def get_current_tos(self):
         try:
-            return super(TermsOfServiceManager, self).get_query_set().get(active=True)
-        except TermsOfService.DoesNotExist:
+            return self.get(active=True) 
+        except self.model.DoesNotExist:
             raise NoActiveTermsOfService('Please create an active Terms-of-Service')
 
 
diff --git a/tos/views.py b/tos/views.py
index ccd0aa1..89e847a 100644
--- a/tos/views.py
+++ b/tos/views.py
@@ -36,7 +36,7 @@ def check_tos(request, template_name='tos/tos_check.html',
     
     note=""
     
-    tos =TermsOfService.objects.get_current_tos()
+    tos = TermsOfService.objects.get_current_tos()
     
     if request.method=="POST":
         if request.POST.get("accept", "") == "accept":
@@ -100,7 +100,7 @@ def login(request, template_name='registration/login.html',
                 
                 return render_to_response('tos/tos_check.html', {
                     redirect_field_name: redirect_to,
-                    'tos':TermsOfService.objects.get_current_tos()
+                    'tos': TermsOfService.objects.get_current_tos()
                 }, context_instance=RequestContext(request))                
 
     else: