diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php
index 10668cd68..3eb436520 100644
--- a/airtime_mvc/application/configs/conf.php
+++ b/airtime_mvc/application/configs/conf.php
@@ -81,5 +81,9 @@ class Config {
 
         $CC_CONFIG['soundcloud-connection-retries'] = $values['soundcloud']['connection_retries'];
         $CC_CONFIG['soundcloud-connection-wait'] = $values['soundcloud']['time_between_retries'];
+        
+        if(isset($values['demo']['demo'])){
+            $CC_CONFIG['demo'] = $values['demo']['demo'];
+        } 
     }
 }
diff --git a/airtime_mvc/application/controllers/LoginController.php b/airtime_mvc/application/controllers/LoginController.php
index 87ddc30a2..b8c786be9 100644
--- a/airtime_mvc/application/controllers/LoginController.php
+++ b/airtime_mvc/application/controllers/LoginController.php
@@ -10,6 +10,8 @@ class LoginController extends Zend_Controller_Action
 
     public function indexAction()
     {
+        global $CC_CONFIG;
+        
         if(Zend_Auth::getInstance()->hasIdentity())
         {
         	$this->_redirect('Nowplaying');
@@ -80,11 +82,14 @@ class LoginController extends Zend_Controller_Action
             }
         }
         
-		$this->view->message = $message;
-		$this->view->error = $error;
-		$this->view->form = $form;
-		$this->view->airtimeVersion = Application_Model_Preference::GetAirtimeVersion();
-		$this->view->airtimeCopyright = AIRTIME_COPYRIGHT_DATE;
+        $this->view->message = $message;
+        $this->view->error = $error;
+        $this->view->form = $form;
+        $this->view->airtimeVersion = Application_Model_Preference::GetAirtimeVersion();
+        $this->view->airtimeCopyright = AIRTIME_COPYRIGHT_DATE;
+        if(isset($CC_CONFIG['demo'])){
+            $this->view->demo = $CC_CONFIG['demo'];
+        }
     }
 
     public function logoutAction()
diff --git a/airtime_mvc/application/forms/Login.php b/airtime_mvc/application/forms/Login.php
index 52323a666..c288b8b37 100644
--- a/airtime_mvc/application/forms/Login.php
+++ b/airtime_mvc/application/forms/Login.php
@@ -5,6 +5,8 @@ class Application_Form_Login extends Zend_Form
 
     public function init()
     { 
+        global $CC_CONFIG;
+        
 		// Set the method for the display form to POST
         $this->setMethod('post');
 
@@ -13,17 +15,19 @@ class Application_Form_Login extends Zend_Form
             'label'      => 'Username:',
             'class'      => 'input_text',
             'required'   => true,
+            'value'      => (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1)?'admin':'',
             'filters'    => array('StringTrim'),
             'validators' => array(
                 'NotEmpty',
             )
         ));
-
+        
 		// Add password element
         $this->addElement('password', 'password', array(
             'label'      => 'Password:',
             'class'      => 'input_text',
             'required'   => true,
+            'value'      => (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1)?'admin':'',
             'filters'    => array('StringTrim'),
             'validators' => array(
                 'NotEmpty',
diff --git a/airtime_mvc/application/views/scripts/login/index.phtml b/airtime_mvc/application/views/scripts/login/index.phtml
index ea6c24e41..bde3fb9f9 100644
--- a/airtime_mvc/application/views/scripts/login/index.phtml
+++ b/airtime_mvc/application/views/scripts/login/index.phtml
@@ -2,6 +2,9 @@
     <div class="logobox">&nbsp;</div>
         <h2>Login</h2>
     <div id="login" class="login-content clearfix">
+        <?php if(isset($this->demo) && $this->demo == 1){?>
+            <p style="font-weight:bold">Welcome to the online Airtime demo! You can log in using the username 'admin' and the password 'admin'.</p>
+        <?php }?>
         <p class="light" style='<?php echo $this->error?"color:#902d2d;font-size:11px;padding:2px 4px;background:#c6b4b4;margin-bottom:2px;border:1px solid #c83f3f;":""?>'><?php echo $this->message; ?></p>
         <?php echo $this->form; ?>
     </div>