diff --git a/hc/api/views.py b/hc/api/views.py
index 9139cb5f..c81ea2d1 100644
--- a/hc/api/views.py
+++ b/hc/api/views.py
@@ -1,5 +1,6 @@
 from datetime import timedelta as td
 
+from django.core.exceptions import FieldError
 from django.db.models import F
 from django.http import HttpResponse, HttpResponseBadRequest, JsonResponse
 from django.utils import timezone
@@ -56,11 +57,23 @@ def checks(request):
 
     elif request.method == "POST":
 
-        unique = bool(request.json.get("unique", False))
+        unique_fields = request.json.get("unique", [])
         name = str(request.json.get("name", ""))
 
-        if unique:
-            existing_checks = Check.objects.filter(user=request.user, name=name)
+        if len(unique_fields) > 0:
+            existing_checks = Check.objects.filter(user=request.user)
+
+            for unique_field in unique_fields:
+
+                field_value = request.json.get(unique_field)
+
+                if unique_field == "timeout" or unique_field == "grace":
+                    field_value = td(seconds=field_value)
+
+                try:
+                    existing_checks = existing_checks.filter(**{unique_field: field_value})
+                except FieldError:
+                    return HttpResponse(status=400)
 
             if existing_checks.count() > 0:
                 # There might be more than one check with the same name since name
diff --git a/templates/front/docs_api.html b/templates/front/docs_api.html
index a680d46e..2299eec4 100644
--- a/templates/front/docs_api.html
+++ b/templates/front/docs_api.html
@@ -130,9 +130,11 @@ The response may contain a JSON document with additional data.
     <tr>
         <th>unique</th>
         <td>
-            <p>bool, optional, default value: False.</p>
-            <p>When true a check won't be created if there exists a check with the
-            same name. If any existing checks match then the first one will be returned.</p>
+            <p>array of strings, optional, default value: [].</p>
+            <p>Tells the API to only create a new check if the combination of fields
+                in <code>unqiue</code> is unique. The fields currently supported are
+                name, tags, timeout, and grace. If a new check is created the API returns
+            a 201 code, otherwise it returns a 200 code.</p>
         </td>
     </tr>
 </table>