diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03744e1b..1fc4f657 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## Fixed
 
 - Number of user points is not being cached resulting in performance boost on certain pages and operations.
-
+- Logout bug
+- Api key is now shown even in trial period
 
 # [0.30.11] - 2025-08-23
 
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 23be077a..e48f01bd 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -4,11 +4,11 @@
   <div class="hero-content flex-col lg:flex-row-reverse w-full my-5">
     <div class="text-center lg:text-left">
       <h1 class="text-5xl font-bold mb-5">Edit your account!</h1>
-      <% if current_user.active? %>
-        <%= render 'devise/registrations/api_key' %>
-      <% else %>
+      <%= render 'devise/registrations/api_key' %>
+      <% if current_user.trial? %>
+        <p>Your trial period ends at <%= human_datetime current_user.active_until %>.</p>
         <p>
-          <%= link_to 'Subscribe', "#{MANAGER_URL}/auth/dawarich?token=#{current_user.generate_subscription_token}", class: 'btn btn-sm btn-success glass' %> to access your API key and start tracking your location.
+          <%= link_to 'Subscribe', "#{MANAGER_URL}/auth/dawarich?token=#{current_user.generate_subscription_token}", class: 'btn btn-sm btn-success glass' %> to continue using Dawarich after your trial ends.
         </p>
       <% end %>
       <% if !DawarichSettings.self_hosted? %>