diff --git a/js/user-alert.js b/js/user-alert.js
index 6c852f9..c5974e6 100644
--- a/js/user-alert.js
+++ b/js/user-alert.js
@@ -3,7 +3,7 @@
     attach: function(context) {
       $.ajax({
         type: 'GET',
-        url: Drupal.settings.basePath + Drupal.settings.user_alert.url_prefix + 'js/user-alert/get-message',
+        url: Drupal.settings.basePath + Drupal.settings.pathPrefix + Drupal.settings.user_alert.url_prefix + 'js/user-alert/get-message',
         success: function(response) {
           $('.block-user-alert').html(response[1].data);
         }
diff --git a/user_alert.module b/user_alert.module
index 7585e9d..dd158b8 100644
--- a/user_alert.module
+++ b/user_alert.module
@@ -143,9 +143,10 @@ function user_alert_form($node, &$form_state) {
  *   Returns themed output if there is a message to display.
  */
 function user_alert_display_alert() {
+  global $language;
 	$output = '';
 
-	$result = db_query("SELECT n.nid FROM {node} n WHERE type = :type AND status = :status AND n.nid NOT IN (SELECT ua.nid FROM {user_alert} ua WHERE ua.nid = n.nid AND ua.uuid = :cookie) ORDER BY nid DESC", array(':type' => 'user_alert', ':status' => 1, ':cookie' => $_COOKIE['UUID']));
+	$result = db_query("SELECT n.nid FROM {node} n WHERE type = :type AND status = :status AND language= :language AND n.nid NOT IN (SELECT ua.nid FROM {user_alert} ua WHERE ua.nid = n.nid AND ua.uuid = :cookie) ORDER BY nid DESC", array(':type' => 'user_alert', ':status' => 1,  ':language' => $language->language, ':cookie' => $_COOKIE['UUID']));
 
 	foreach ($result as $record) {
 		$alert = node_load($record->nid);