diff --git a/app/main/forms.py b/app/main/forms.py
index 9e96a8ccc..fe83ae0b4 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -516,3 +516,8 @@ class Whitelist(Form):
         max_entries=5,
         label="Mobile numbers"
     )
+
+class DateFilterForm(Form):
+    start_date = DateField("Start Date", [validators.optional()])
+    end_date = StringField("End Date", [validators.optional()])
+    include_from_test_key = BooleanField("Include test keys", default='checked')
diff --git a/app/main/views/platform_admin.py b/app/main/views/platform_admin.py
index 70f598efb..a91a111a5 100644
--- a/app/main/views/platform_admin.py
+++ b/app/main/views/platform_admin.py
@@ -1,5 +1,6 @@
 import itertools
 
+from datetime import datetime
 from flask import (
     render_template,
     request
@@ -8,6 +9,7 @@ from flask_login import login_required
 
 from app import service_api_client
 from app.main import main
+from app.main.forms import DateFilterForm
 from app.utils import user_has_permissions
 from app.statistics_utils import get_formatted_percentage
 
@@ -16,9 +18,10 @@ from app.statistics_utils import get_formatted_percentage
 @login_required
 @user_has_permissions(admin_override=True)
 def platform_admin():
-    include_from_test_key = request.args.get('include_from_test_key') != 'False'
-    start_date = request.args.get('start_date', None)
-    end_date = request.args.get('end_date', None)
+    form = DateFilterForm(request.args)
+    include_from_test_key = form.include_from_test_key.data
+    start_date = form.start_date.data
+    end_date = form.end_date.data
     # specifically DO get inactive services
     api_args = {'detailed': True}
     if not include_from_test_key:
@@ -29,13 +32,14 @@ def platform_admin():
         # but I could get the validation right, not did the page look good.
         # This is just an intermediate pass at returning the data.
         api_args['start_date'] = start_date
-        api_args['end_date'] = end_date
+        api_args['end_date'] = end_date or datetime.utcnow().date()
 
     services = service_api_client.get_services(api_args)['data']
 
     return render_template(
         'views/platform-admin.html',
         include_from_test_key=include_from_test_key,
+        form=form,
         **get_statistics(sorted(
             services,
             key=lambda service: (service['active'], service['created_at']),
diff --git a/app/templates/views/platform-admin.html b/app/templates/views/platform-admin.html
index 6147edaa3..94b1ae7dc 100644
--- a/app/templates/views/platform-admin.html
+++ b/app/templates/views/platform-admin.html
@@ -1,5 +1,6 @@
 {% extends "withoutnav_template.html" %}
 {% from "components/textbox.html" import textbox %}
+{% from "components/checkbox.html" import checkbox %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/big-number.html" import big_number, big_number_with_status %}
 {% from "components/message-count-label.html" import message_count_label %}
@@ -89,14 +90,16 @@
     Platform admin
   </h1>
 
-  <p class="bottom-gutter-2">
-    Showing stats for today&emsp;
-    {% if include_from_test_key %}
-      Including test keys (<a href="{{ url_for('.platform_admin', include_from_test_key=False) }}">change</a>)
-    {% else %}
-      Excluding test keys (<a href="{{ url_for('.platform_admin') }}">change</a>)
-    {% endif %}
-  </p>
+    <details>
+      <summary>Apply filters</summary>
+      <form autocomplete="off" method="get">
+        {{ textbox(form.start_date, hint="Enter start date in format YYYY-MM-DD") }}
+        {{ textbox(form.end_date, hint="Enter end date in format YYYY-MM-DD") }}
+        {{ checkbox(form.include_from_test_key) }}
+        </br>
+        <input type="submit" class="button">
+      </form>
+    </details>
 
   <div class="grid-row bottom-gutter">
     <div class="column-half">