diff --git a/app/site_files.rb b/app/site_files.rb
index a5b0086c..9ba69267 100644
--- a/app/site_files.rb
+++ b/app/site_files.rb
@@ -231,6 +231,7 @@ end
 post '/site_files/chat' do
   require_login
   dont_browser_cache
+  halt(403) unless parent_site.supporter?
 
   # Ensure the request is treated as a stream
   stream do |out|
diff --git a/public/js/chat.js b/public/js/chat.js
index b827b763..a07a24e6 100644
--- a/public/js/chat.js
+++ b/public/js/chat.js
@@ -51,12 +51,9 @@ document.addEventListener('DOMContentLoaded', () => {
 
       var formData = new FormData();
       formData.append('csrf_token', chatForm.querySelector('input[name="csrf_token"]').value);
-      
-      
-      // uncomment this out if disable next two lines
-      //formData.append('system', system);
-      
-      let systemWithFile = system + "\nThis is the user's current file they are editing:\n" + editor.getValue();
+
+      // let systemWithFile = system + "\nThis is the user's current file they are editing:\n" + editor.getValue();
+      let systemWithFile = system
       formData.append('system', systemWithFile);
       
       formData.append('messages', JSON.stringify(messages));
@@ -229,6 +226,7 @@ document.addEventListener('DOMContentLoaded', () => {
     let chatContainer = document.getElementsByClassName('chat-container')[0];
 
     var chatEnabled = localStorage.getItem('chatEnabled');
+
     if (chatEnabled === 'true') {
       leftCol.style.width = localStorage.getItem('leftColPct') || '70%';
       rightCol.style.width = localStorage.getItem('rightColPct') || '30%';
diff --git a/views/site_files/text_editor.erb b/views/site_files/text_editor.erb
index 874dabc1..f74a07c6 100644
--- a/views/site_files/text_editor.erb
+++ b/views/site_files/text_editor.erb
@@ -90,7 +90,7 @@
       <a id="saveButton" class="btn-Action" href="#" onclick="saveTextFile(false); return false" style="opacity: 0.5"><span class="hide-on-mobile"><i class="fa fa-save"></i></span>Save</a>
       <span class="hide-on-mobile">
         <a class="btn-Action" href="<%= current_site.uri %>/<%= @filename == 'index.html' ? '' : @filename %>" target="_blank"><i class="fa fa-globe"></i> View</a>
-        <a href="#" id="shareButton" class="btn-Action" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<%== erb :'_share', layout: false, locals: {site: current_site, page_uri: "#{current_site.uri}/#{@filename}"} %>'><i class="fa fa-share-alt chat-button"></i> Share</a> <a class="btn-Action" id="chatButton"><i class="fa fa-comments"></i> Chat</a>
+        <a href="#" id="shareButton" class="btn-Action" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<%== erb :'_share', layout: false, locals: {site: current_site, page_uri: "#{current_site.uri}/#{@filename}"} %>'><i class="fa fa-share-alt chat-button"></i> Share</a><% if current_site.supporter? %><a class="btn-Action" id="chatButton"><i class="fa fa-comments"></i> Chat</a><% end %>
       </span>
     <!-- <a id="saveAndExitButton" class="btn-Action" href="#" onclick="saveTextFile(true); return false" style="opacity: 0.5"><i class="fa fa-save"></i>&nbsp;&nbsp;Save and Exit</a> -->
       <div id="editorUpdates" class="tooltip fade bottom in hidden" style="top: 90px;right: 12.5em;">
@@ -106,10 +106,13 @@
 <script src="/js/purify.min.js"></script>
 <script src="/js/marked.min.js"></script>
 <script src="/js/sse.min.js"></script>
-<script src="/js/chat.js"></script>
+
+<% if current_site.supporter? %>
+  <script src="/js/chat.js"></script>
+<% end %>
 
 <div class="row editor">
-  <div class="col left-col" style="display: none">
+  <div class="col left-col" style="display: <% current_site.supporter? ? 'none' : 'block' %>; margin-left: 20px;">
     <div id="editor"><h3>Loading...</h3></div>
   </div>
   <div class="col right-col chat-container" style="display: none">