Index: Query.py
===================================================================
--- Query.py	(revision 1547)
+++ Query.py	(working copy)
@@ -336,7 +336,15 @@
                             continue
                     else:
                         continue
-                constraints[field] = vals
+                if field == 'owner':
+                    for i in range(len(vals)):
+                        if vals[i] == '$USER':
+                            vals[i] = req.authname
+                        elif vals[i] == '!$USER':
+                            vals[i] = '!' + req.authname
+                    constraints[field] = vals
+                else:
+                    constraints[field] = vals
 
         return constraints