diff --git a/airtime_mvc/application/controllers/ListenerstatController.php b/airtime_mvc/application/controllers/ListenerstatController.php
index 302bd386c..0192eaec8 100644
--- a/airtime_mvc/application/controllers/ListenerstatController.php
+++ b/airtime_mvc/application/controllers/ListenerstatController.php
@@ -52,6 +52,9 @@ class ListenerstatController extends Zend_Controller_Action
         $out = array();
         foreach ($errorStatus as $v) {
             $key = explode('_listener_stat_error', $v['keyname']);
+            if ($v['value'] != 'OK') {
+                $v['value'] = _("Please make sure admin user/password is correct on System->Streams page.");
+            }
             $out[$key[0]] = $v['value'];
         }
         
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 9526cd9f3..1f0c3e243 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -41,10 +41,12 @@ var AIRTIME = (function(AIRTIME){
 
     mod.updateCalendarStatusIcon = function(json) {
 
-        if (window.location.pathname.toLowerCase() != "/schedule") {
+
+        if (window.location.pathname.toLowerCase() != baseUrl+"/schedule") {
             return;
         }
 
+
         var instance_id = json.schedule[0].instance;
 
         var lastElem = json.schedule[json.schedule.length-1];