diff --git a/.app_version b/.app_version
index 66333910..503a21de 100644
--- a/.app_version
+++ b/.app_version
@@ -1 +1 @@
-0.18.0
+0.18.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3eceee6..6c1cd353 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+# 0.18.2 - 2024-11-29
+
+### Added
+
+- Demo account. You can now login with `demo@dawarich.app` / `password` to see how Dawarich works. This replaces previous default credentials.
+
+### Changed
+
+- The login page now shows demo account credentials if `DEMO_ENV` env var is set to `true`.
+
 # 0.18.1 - 2024-11-29
 
 ### Fixed
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 2088f026..9b41d145 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -2,7 +2,7 @@
   <div class="hero-content flex-col lg:flex-row-reverse w-full my-10">
     <div class="text-center lg:text-left">
       <h1 class="text-5xl font-bold">Register now!</h1>
-      <p class="py-6">And change this text!</p>
+      <p class="py-6">and take control over your location data.</p>
     </div>
     <div class="card flex-shrink-0 w-full max-w-sm shadow-2xl bg-base-100 px-5 py-5">
       <%= form_for(resource, as: resource_name, url: registration_path(resource_name), class: 'form-body ') do |f| %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index b0653930..d8cb0cde 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,8 +1,13 @@
 <div class="hero min-h-content bg-base-200">
   <div class="hero-content flex-col lg:flex-row-reverse w-full my-10">
     <div class="text-center lg:text-left">
-      <h1 class="text-5xl font-bold">Login now!</h1>
-      <p class="py-6">And change this text!</p>
+      <h1 class="text-5xl font-bold">Login now</h1>
+      <p class="py-6">and take control over your location data.</p>
+      <% if ENV['DEMO_ENV'] == 'true' %>
+        <p class="py-6">
+          Demo account: <strong class="text-success">demo@dawarich.app</strong> / password: <strong class="text-success">password</strong>
+        </p>
+      <% end %>
     </div>
     <div class="card flex-shrink-0 w-full max-w-sm shadow-2xl bg-base-100 px-5 py-5">
       <%= form_for(resource, as: resource_name, url: session_path(resource_name), class: 'form-body ') do |f| %>
diff --git a/db/seeds.rb b/db/seeds.rb
index b6f1e1e8..2593b777 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -2,8 +2,10 @@
 
 return if User.any?
 
+puts 'Creating user...'
+
 User.create!(
-  email: 'user@domain.com',
+  email: 'demo@dawarich.app',
   password: 'password',
   password_confirmation: 'password',
   admin: true