diff --git a/rowers/views.py b/rowers/views.py
index 58fd0d60..61287c06 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -2744,6 +2744,10 @@ def histo_all(request,theuser=0,
     if enddatestring != "":
 	enddate = iso8601.parse_date(enddatestring)
 
+
+    startdate = datetime.datetime.combine(startdate,datetime.time())
+    enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
+
     if enddate < startdate:
 	s = enddate
 	enddate = startdate
@@ -6411,9 +6415,8 @@ def courses_view(request):
 # List Workouts    
 @login_required()
 def workouts_view(request,message='',successmessage='',
-                  startdatestring="",enddatestring="",
-                  startdate=timezone.now()-datetime.timedelta(days=365),
-                  enddate=timezone.now(),
+                  startdatestring='',
+                  enddatestring='',
                   teamid=0,rankingonly=False,rowerid=0,userid=0):
 
     request.session['referer'] = absolute(request)['PATH']
@@ -6433,13 +6436,26 @@ def workouts_view(request,message='',successmessage='',
     if not checkaccessuser(request.user,r):
         raise PermissionDenied("Access denied")
 
+    if startdatestring:
+        startdate = iso8601.parse_date(startdatestring)
+    else:
+        startdate = datetime.date.today()-datetime.timedelta(days=365)
+
+    if enddatestring:
+        enddate = iso8601.parse_date(enddatestring)
+    else:
+        enddate = datetime.date.today()
+
+
+    startdate = datetime.datetime.combine(startdate,datetime.time())
+    enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
+
+    
     if request.method == 'POST':
         dateform = DateRangeForm(request.POST)
         if dateform.is_valid():
             startdate = dateform.cleaned_data['startdate']
             enddate = dateform.cleaned_data['enddate']
-            startdatestring = None
-            enddatestring = None
     else:
         dateform = DateRangeForm(initial={
             'startdate':startdate,
@@ -6450,16 +6466,15 @@ def workouts_view(request,message='',successmessage='',
     enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
     #enddate = enddate+datetime.timedelta(days=1)
 
-    if startdatestring:
-        startdate = iso8601.parse_date(startdatestring)
-    if enddatestring:
-        enddate = iso8601.parse_date(enddatestring)
 
     if enddate < startdate:
         s = enddate
         enddate = startdate
         startdate = s
 
+    startdatestring = startdate.strftime('%Y-%m-%d')
+    enddatestring = enddate.strftime('%Y-%m-%d')
+
     # start date for the small graph
     activity_startdate = enddate-datetime.timedelta(days=15)