diff --git a/.gitignore b/.gitignore
index 01d66723d..70612e70d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,5 @@ sync.sh
 *.swp
 .debug
 .maintenance
+.demo
 .htaccess
diff --git a/application/controllers/User.php b/application/controllers/User.php
index da470bacb..de70bee62 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -923,75 +923,83 @@ class User extends CI_Controller {
 	 */
 	function forgot_password() {
 
-		$this->load->helper(array('form', 'url'));
+		if (file_exists('.demo')) {
 
-		$this->load->library('form_validation');
+			$this->session->set_flashdata('error', __("Password Reset is disabled on the Demo!"));
+			redirect('user/login');
 
-		$this->form_validation->set_rules('email', 'Email', 'required');
+		} else {
+			
+			$this->load->helper(array('form', 'url'));
 
-		if ($this->form_validation->run() == FALSE)
-		{
-			$data['page_title'] = __("Forgot Password");
-			$this->load->view('interface_assets/mini_header', $data);
-			$this->load->view('user/forgot_password');
-			$this->load->view('interface_assets/footer');
-		}
-		else
-		{
-			// Check email address exists
-			$this->load->model('user_model');
+			$this->load->library('form_validation');
 
-			$check_email = $this->user_model->check_email_address($this->input->post('email', true));
+			$this->form_validation->set_rules('email', 'Email', 'required');
 
-			if($check_email == TRUE) {
-				// Generate password reset code 50 characters long
-				$this->load->helper('string');
-				$reset_code = random_string('alnum', 50);
+			if ($this->form_validation->run() == FALSE)
+			{
+				$data['page_title'] = __("Forgot Password");
+				$this->load->view('interface_assets/mini_header', $data);
+				$this->load->view('user/forgot_password');
+				$this->load->view('interface_assets/footer');
+			}
+			else
+			{
+				// Check email address exists
+				$this->load->model('user_model');
 
-				$this->user_model->set_password_reset_code($this->input->post('email', true), $reset_code);
+				$check_email = $this->user_model->check_email_address($this->input->post('email', true));
 
-				// Send email with reset code
+				if($check_email == TRUE) {
+					// Generate password reset code 50 characters long
+					$this->load->helper('string');
+					$reset_code = random_string('alnum', 50);
 
-				$this->data['reset_code'] = $reset_code;
-				$this->load->library('email');
+					$this->user_model->set_password_reset_code($this->input->post('email', true), $reset_code);
 
-				if($this->optionslib->get_option('emailProtocol') == "smtp") {
-					$config = Array(
-						'protocol' => $this->optionslib->get_option('emailProtocol'),
-						'smtp_crypto' => $this->optionslib->get_option('smtpEncryption'),
-						'smtp_host' => $this->optionslib->get_option('smtpHost'),
-						'smtp_port' => $this->optionslib->get_option('smtpPort'),
-						'smtp_user' => $this->optionslib->get_option('smtpUsername'),
-						'smtp_pass' => $this->optionslib->get_option('smtpPassword'),
-						'crlf' => "\r\n",
-						'newline' => "\r\n"
-					  );
+					// Send email with reset code
 
-					  $this->email->initialize($config);
-				}
+					$this->data['reset_code'] = $reset_code;
+					$this->load->library('email');
 
-				$message = $this->load->view('email/forgot_password', $this->data,  TRUE);
+					if($this->optionslib->get_option('emailProtocol') == "smtp") {
+						$config = Array(
+							'protocol' => $this->optionslib->get_option('emailProtocol'),
+							'smtp_crypto' => $this->optionslib->get_option('smtpEncryption'),
+							'smtp_host' => $this->optionslib->get_option('smtpHost'),
+							'smtp_port' => $this->optionslib->get_option('smtpPort'),
+							'smtp_user' => $this->optionslib->get_option('smtpUsername'),
+							'smtp_pass' => $this->optionslib->get_option('smtpPassword'),
+							'crlf' => "\r\n",
+							'newline' => "\r\n"
+						);
 
-				$this->email->from($this->optionslib->get_option('emailAddress'), $this->optionslib->get_option('emailSenderName'));
-				$this->email->to($this->input->post('email', true));
+						$this->email->initialize($config);
+					}
 
-				$this->email->subject('Wavelog Account Password Reset');
-				$this->email->message($message);
+					$message = $this->load->view('email/forgot_password', $this->data,  TRUE);
 
-				if (! $this->email->send())
-				{
-					// Redirect to login page with message
-					$this->session->set_flashdata('warning', __("Email settings are incorrect."));
-					redirect('user/login');
+					$this->email->from($this->optionslib->get_option('emailAddress'), $this->optionslib->get_option('emailSenderName'));
+					$this->email->to($this->input->post('email', true));
+
+					$this->email->subject('Wavelog Account Password Reset');
+					$this->email->message($message);
+
+					if (! $this->email->send())
+					{
+						// Redirect to login page with message
+						$this->session->set_flashdata('warning', __("Email settings are incorrect."));
+						redirect('user/login');
+					} else {
+						// Redirect to login page with message
+						$this->session->set_flashdata('notice', __("Password Reset Processed."));
+						redirect('user/login');
+					}
 				} else {
-					// Redirect to login page with message
+					// No account found just return to login page
 					$this->session->set_flashdata('notice', __("Password Reset Processed."));
 					redirect('user/login');
 				}
-			} else {
-				// No account found just return to login page
-				$this->session->set_flashdata('notice', __("Password Reset Processed."));
-				redirect('user/login');
 			}
 		}
 	}
diff --git a/application/views/user/login.php b/application/views/user/login.php
index ac32a36f3..b4a1a147d 100644
--- a/application/views/user/login.php
+++ b/application/views/user/login.php
@@ -38,16 +38,26 @@
     <?php } ?>
     <div class="my-2 rounded-0 shadow-sm card mb-2 shadow-sm">
         <div class="card-body">
+            <?php // only used for Wavelog Demo
+            if (file_exists('.demo')) { ?>
+                <div class="border-bottom mb-3">
+                    <h5><?= __("Welcome to the Demo of Wavelog"); ?></h5>
+                    <p><?= __("This demo will be reset every night at 0200z."); ?><br><br>
+                    <?= __("Username"); ?>: demo<br>
+                    <?= __("Password"); ?>: demo<br><br>
+                    <?= sprintf(__("More Information about Wavelog on <a href='%s' target='_blank'>Github</a>."), "https://www.github.com/wavelog/wavelog"); ?></p>
+                </div>
+            <?php } ?>
             <form method="post" action="<?php echo site_url('user/login'); ?>" name="users">
                 <?php $this->form_validation->set_error_delimiters('', ''); ?>
                 <input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
                 <div class="mb-2">
                     <label for="floatingInput"><strong><?= __("Username"); ?></strong></label>
-                    <input type="text" name="user_name" class="form-control" id="floatingInput" placeholder="<?= __("Username"); ?>" value="<?php echo $this->input->post('user_name'); ?>" autofocus>
+                    <input type="text" name="user_name" class="form-control" id="floatingInput" placeholder="<?php if (file_exists('.demo')) { echo "demo"; } else { echo __("Username"); } ?>" value="<?php echo $this->input->post('user_name'); ?>" autofocus>
                 </div>
                 <div class="mb-2">
                     <label for="floatingPassword"><strong><?= __("Password"); ?></strong></label>
-                    <input type="password" name="user_password" class="form-control" id="floatingPassword" placeholder="<?= __("Password"); ?>">
+                    <input type="password" name="user_password" class="form-control" id="floatingPassword" placeholder="<?php if (file_exists('.demo')) { echo "demo"; } else { echo __("Password"); } ?>">
                 </div>
                 <div class="mb-2">
                     <div class="row">