diff --git a/app/index.rb b/app/index.rb
index 9648295a..c1a1c4eb 100644
--- a/app/index.rb
+++ b/app/index.rb
@@ -48,11 +48,12 @@ get '/?' do
     @create_disabled = false
 
     @index_rendered = SimpleCache.store :index, erb(:index, layout: :index_layout), (ENV['RACK_ENV'] == 'test' ? -1 : 1.hour)
-
-    return @index_rendered
   else
-    return SimpleCache.get(:index)
+    @index_rendered = SimpleCache.get(:index)
   end
+
+  @index_rendered.gsub! 'CSRF_TOKEN_HERE', csrf_token
+  @index_rendered
 end
 
 get '/welcome' do
diff --git a/views/_index_signup_script.erb b/views/_index_signup_script.erb
index def586f1..23167184 100644
--- a/views/_index_signup_script.erb
+++ b/views/_index_signup_script.erb
@@ -30,7 +30,7 @@
   })
 
   $('input[type=text],input[type=password],input[type=email]').on('change focusout', function(obj) {
-    $.post('/create_validate', {field: obj.target.name, value: obj.target.value, is_education: $('input[name=is_education]')[0].value, csrf_token: '<%= csrf_token %>'}, function(res) {
+    $.post('/create_validate', {field: obj.target.name, value: obj.target.value, is_education: $('input[name=is_education]')[0].value, csrf_token: 'CSRF_TOKEN_HERE'}, function(res) {
       if(res.result == 'ok') {
         return $(obj.target).tooltip('hide')
       }
diff --git a/views/index.erb b/views/index.erb
index bd79e743..dac456cb 100644
--- a/views/index.erb
+++ b/views/index.erb
@@ -91,7 +91,7 @@
       </div>
     <% else %>
       <form id="createSiteForm" class="signup-Form" onsubmit="return false">
-        <input type="hidden" name="csrf_token" value="<%= csrf_token %>">
+        <input type="hidden" name="csrf_token" value="CSRF_TOKEN_HERE">
         <input type="hidden" name="is_education" value="false">
         <fieldset class="content">
           <h2 class="gamma">Sign up for free</h2>