diff --git a/NEWS b/NEWS
index 00d36eda1..d94ed80cd 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@
 ------------------
 
 New features
- - sogo-tool: new "dump-defaults" command to easily create /etc/sogo.conf
+ - sogo-tool: new "dump-defaults" command to easily create /etc/sogo/sogo.conf
 
 Enhancements
  - The sogo user is now a system user.
@@ -17,6 +17,7 @@ Enhancements
  - added Finnish translation - thanks to Kari Salmu
  - updated translations
  - recurrence-id of all-day events is now set as a proper date with no time
+ - 'show completed tasks' is now persistent
 
 Bug fixes
  - fixed usage of browser's language for the login page
diff --git a/UI/Scheduler/UIxCalMainView.m b/UI/Scheduler/UIxCalMainView.m
index 9bd30c2a9..a7f9222a1 100644
--- a/UI/Scheduler/UIxCalMainView.m
+++ b/UI/Scheduler/UIxCalMainView.m
@@ -212,6 +212,15 @@
    return (list && [list compare: @"tasksListView"] == NSOrderedSame)? @"active" : @"";
 }
 
+- (BOOL) showCompletedTasks
+{
+  BOOL show;
+
+  [self _setupContext];
+
+  return [[us objectForKey: @"ShowCompletedTasks"] boolValue];
+}
+
 - (WOResponse *) saveSelectedListAction
 {
   WORequest *request;
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index d95e6e442..8b5e2e556 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -182,7 +182,7 @@
                      autocomplete="off" type="text"
                      menuid="taskSearchMenu" />
             </span>
-            <input id="showHideCompletedTasks" type="checkbox" class="checkBox"/><var:string label:value="Show completed tasks"/>
+            <input id="showHideCompletedTasks" type="checkbox" class="checkBox" var:checked="showCompletedTasks"/><var:string label:value="Show completed tasks"/>
           </div>
           <table id="tasksList" cellspacing="0">
             <thead>
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 137b8ee3c..97eb6da88 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -2198,20 +2198,14 @@ function refreshEvents() {
 function refreshTasks(setUserDefault) {
     var titleSearch;
     var value = search["tasks"]["value"];
-    var setud;
 
     if (value && value.length)
         titleSearch = "&search=" + escape(value.utf8encode());
     else
         titleSearch = "";
 
-    /* TODO: the logic behind this should be reimplemented properly:
-       the "taskslist" method should save the status when the 'show-completed'
-       is set to true and revert to the current status when that parameter is
-       NOT passed via the url. */
-    setud = "";
     if (setUserDefault == 1)
-      setud = "&setud=1";
+      titleSearch += "&setud=1";
 
     refreshAlarms();