diff --git a/Model/AppModel.php b/Model/AppModel.php
index 325bb1507..e3c86b4bf 100644
--- a/Model/AppModel.php
+++ b/Model/AppModel.php
@@ -300,6 +300,16 @@ public function autoJoinModel($Model, $options = array()) {
 
 			$this->_joinConditions($Model, $options);
 
+			if($Model->alias !== $options['alias']) {
+				$conditions = array();
+				foreach($options['conditions'] as $k => $v) {
+					$k = str_replace($Model->alias, $options['alias'], $k);
+					$v = str_replace($Model->alias, $options['alias'], $v);
+					$conditions[$k] = $v;
+				}
+				$options['conditions'] = $conditions;
+			}
+
 			return $options;
 		}