Index: 8.0.4/gui/storage/views.py
===================================================================
--- 8.0.4/gui/storage/views.py  (revision 6454)
+++ 8.0.4/gui/storage/views.py  (working copy)
@@ -312,6 +312,7 @@
 def dataset_create(request):
     defaults = { 'dataset_compression' : 'inherit', 'dataset_atime' : 'inherit', }
     dataset_form = forms.ZFSDataset_CreateForm(initial=defaults)
+    dedup_enabled = forms._dedup_enabled()
     if request.method == 'POST':
         dataset_form = forms.ZFSDataset_CreateForm(request.POST)
         if dataset_form.is_valid():
@@ -346,11 +347,14 @@
                 return HttpResponse(simplejson.dumps({"error": False, "message": _("Dataset successfully added.")}), mimetype="application/json")
             else:
                 dataset_form.set_error(errmsg)
+                if dedup_enabled:
+                    dataset_form.errors['dataset_dedup'] = (DEDUP_ERROR, )
+        else:
+            if dedup_enabled:
                 dataset_form.errors['dataset_dedup'] = (DEDUP_ERROR, )
-        else:
+    else
+        if dedup_enabled:
             dataset_form.errors['dataset_dedup'] = (DEDUP_ERROR, )
-    else:
-        dataset_form.errors['dataset_dedup'] = (DEDUP_ERROR, )
     return render(request, 'storage/datasets.html', {
         'focused_tab' : 'storage',
         'form': dataset_form
@@ -359,6 +363,7 @@
 def dataset_edit(request, object_id):
     mp = models.MountPoint.objects.get(pk=object_id)
     dataset_form = forms.ZFSDataset_EditForm(mp=mp)
+    dedup_enabled = forms._dedup_enabled()
     if request.method == 'POST':
         dataset_form = forms.ZFSDataset_EditForm(request.POST, mp=mp)
         if dataset_form.is_valid():
@@ -386,12 +391,15 @@
                 return HttpResponse(simplejson.dumps({"error": False, "message": _("Dataset successfully edited.")}), mimetype="application/json")
             else:
                 dataset_form.set_error(_("An error occurred when setting the options"))
+                if dedup_enabled:
+                    dataset_form.errors['dataset_dedup'] = (DEDUP_ERROR, )
+        else:
+            if dedup_enabled:
                 dataset_form.errors['dataset_dedup'] = (DEDUP_ERROR, )
-        else:
-            dataset_form.errors['dataset_dedup'] = (DEDUP_ERROR, )

     else:
-        dataset_form.errors['dataset_dedup'] = (DEDUP_ERROR, )
+        if dedup_enabled:
+            dataset_form.errors['dataset_dedup'] = (DEDUP_ERROR, )
     return render(request, 'storage/dataset_edit.html', {
         'mp': mp,
         'form': dataset_form
@@ -440,6 +448,7 @@
 def zfsvolume_edit(request, object_id):
     mp = models.MountPoint.objects.get(pk=object_id)
     volume_form = forms.ZFSVolume_EditForm(mp=mp)
+    dedup_enabled = forms._dedup_enabled()
     if request.method == 'POST':
         volume_form = forms.ZFSVolume_EditForm(request.POST, mp=mp)
         if volume_form.is_valid():
@@ -466,11 +475,14 @@
                 return HttpResponse(simplejson.dumps({"error": False, "message": _("Native dataset successfully edited.")}), mimetype="application/json")
             else:
                 volume_form.set_error(_("An error occurred when setting the options"))
+                if dedup_enabled:
+                    volume_form.errors['volume_dedup'] = (DEDUP_ERROR, )
+        else:
+            if dedup_enabled:
                 volume_form.errors['volume_dedup'] = (DEDUP_ERROR, )
-        else:
+    else:
+        if dedup_enabled:
             volume_form.errors['volume_dedup'] = (DEDUP_ERROR, )
-    else:
-        volume_form.errors['volume_dedup'] = (DEDUP_ERROR, )
     return render(request, 'storage/volume_edit.html', {
         'mp': mp,
         'form': volume_form