diff --git a/lib/WebGUI/Search.pm b/lib/WebGUI/Search.pm
index 9561fbb6d..6d25b2691 100644
--- a/lib/WebGUI/Search.pm
+++ b/lib/WebGUI/Search.pm
@@ -282,6 +282,10 @@ sub search {
 				}
 			#-------------- Edited by zxp end
                 		$terms[$i] .= "*";
+				
+                                # By default results need to match ALL keywords / Len Kranendonk 20060811
+                                $terms[$i] = "+" . $terms[$i] if ($terms[$i] !~ m/^[+-]/);
+
         		}
         		$keywords = join(" ", @terms);
 		}