diff --git a/airtime_mvc/application/forms/AddUser.php b/airtime_mvc/application/forms/AddUser.php
index 75a8f659c..1d3835ae7 100644
--- a/airtime_mvc/application/forms/AddUser.php
+++ b/airtime_mvc/application/forms/AddUser.php
@@ -1,4 +1,5 @@
 <?php
+require_once( __DIR__ . '/../validate/NotDemoValidate.php');
 
 class Application_Form_AddUser extends Zend_Form
 {
@@ -12,7 +13,8 @@ class Application_Form_AddUser extends Zend_Form
                                     * */
         $notEmptyValidator = Application_Form_Helper_ValidationTypes::overrideNotEmptyValidator();
         $emailValidator = Application_Form_Helper_ValidationTypes::overrideEmailAddressValidator();
-
+        $notDemoValidator = new Application_Validate_NotDemoValidate();
+        
         $this->setAttrib('id', 'user_form');
         
         $hidden = new Zend_Form_Element_Hidden('user_id');
@@ -42,6 +44,7 @@ class Application_Form_AddUser extends Zend_Form
         $passwordVerify->setRequired(true);
         $passwordVerify->addFilter('StringTrim');
         $passwordVerify->addValidator($notEmptyValidator);
+        $passwordVerify->addValidator($notDemoValidator);
         $this->addElement($passwordVerify);
 
         $firstName = new Zend_Form_Element_Text('first_name');
diff --git a/airtime_mvc/application/forms/EditUser.php b/airtime_mvc/application/forms/EditUser.php
index cff9dfdda..2711bb334 100644
--- a/airtime_mvc/application/forms/EditUser.php
+++ b/airtime_mvc/application/forms/EditUser.php
@@ -1,4 +1,5 @@
 <?php
+require_once( __DIR__ . '/../validate/NotDemoValidate.php');
 
 class Application_Form_EditUser extends Zend_Form
 {
@@ -16,7 +17,8 @@ class Application_Form_EditUser extends Zend_Form
         $userData = Application_Model_User::GetUserData($currentUserId);
         $notEmptyValidator = Application_Form_Helper_ValidationTypes::overrideNotEmptyValidator();
         $emailValidator = Application_Form_Helper_ValidationTypes::overrideEmailAddressValidator();
-
+        $notDemoValidator = new Application_Validate_NotDemoValidate();
+        
         $this->setDecorators(array(
                 array('ViewScript', array('viewScript' => 'form/edit-user.phtml', "currentUser" => $currentUser->getLogin()))));
         $this->setAttrib('id', 'current-user-form');
@@ -52,6 +54,7 @@ class Application_Form_EditUser extends Zend_Form
         $passwordVerify->setRequired(true);
         $passwordVerify->addFilter('StringTrim');
         $passwordVerify->addValidator($notEmptyValidator);
+        $passwordVerify->addValidator($notDemoValidator);
         $passwordVerify->setDecorators(array('viewHelper'));
         $this->addElement($passwordVerify);
 
diff --git a/airtime_mvc/application/validate/NotDemoValidate.php b/airtime_mvc/application/validate/NotDemoValidate.php
new file mode 100644
index 000000000..2ebdfcc14
--- /dev/null
+++ b/airtime_mvc/application/validate/NotDemoValidate.php
@@ -0,0 +1,24 @@
+<?php
+
+class Application_Validate_NotDemoValidate extends Zend_Validate_Abstract
+{
+    const NOTDEMO = 'notdemo';
+
+    protected $_messageTemplates = array(
+        self::NOTDEMO => "Cannot be changed in demo mode"
+    );
+
+    public function isValid($value)
+    {
+    	$this->_setValue($value);
+        
+        $CC_CONFIG = Config::getConfig();
+        if (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1) {
+        	$this->_error(self::NOTDEMO);
+        	return false;	
+        } else {
+        	return true;
+        }
+    }
+}
+