diff --git a/todos/index.php b/todos/index.php
index e86fee3..a035b4a 100644
--- a/todos/index.php
+++ b/todos/index.php
@@ -18,7 +18,8 @@
 }
 $owner = $AppUI->getState('TodoOwner') !== null ? $AppUI->getState('TodoOwner') : $AppUI->user_id;
 
-$user_list = $users = $perms->getPermittedUsers('projects');
+$user_list[0] = 'All Users';
+$user_list += $users = $perms->getPermittedUsers('projects');
 ?>
 <script src="./modules/todos/todos.js" type="text/javascript"></script>
 <link rel="stylesheet" type="text/css" href="./modules/todos/todos.css" />
diff --git a/todos/todos.class.php b/todos/todos.class.php
index 2f174b5..e404112 100644
--- a/todos/todos.class.php
+++ b/todos/todos.class.php
@@ -95,7 +95,9 @@ public function getTodosForDateRange($dateRangeName, $user_id = 0, $project_id =
                 $q->addWhere("st.todo_due_date > '$nextSunday'");
 		}
 		$q->addWhere('st.todo_status = 1');
-        $q->addWhere("st.todo_owner = ".(($user_id > 0) ? $user_id : $this->_AppUI->user_id));
+        if ($user_id) {
+            $q->addWhere("st.todo_owner = " . $user_id);
+        }
 
         $q->addQuery('pr.project_name, pr.project_color_identifier, pr.project_company');
         $q->leftJoin('projects', 'pr', 'pr.project_id = st.todo_project');