diff --git a/coinmanager/coinc/static/coinc/main.js b/coinmanager/coinc/static/coinc/main.js
index aa0a603..2d4878b 100644
--- a/coinmanager/coinc/static/coinc/main.js
+++ b/coinmanager/coinc/static/coinc/main.js
@@ -1,6 +1,6 @@
 /*
 
-    Copyright (C) 2020 willipink.eu
+    Copyright (C) 2020-2022 willipink.eu
     Author Moritz Münch moritzmuench@mailbox.org
 
     This program is free software: you can redistribute it and/or modify
@@ -239,12 +239,12 @@ $(document).ready(function() {
 
     function login(args, form_data) {
         $('body').css('cursor', 'progress');
+        form_data['csrfmiddlewaretoken'] = cookie.get('csrftoken');
         $.ajax({
             type:     'POST',
             url:      './accounts/login/',
             data:     form_data,
             success:  function(response) {
-	      // TODO nötig, da der csrf-token nach dem anmelden geändert wird und ich mir erst den neuen holen muss.
               window.open(window.location.href, '_self');
               detach('#login');
               //$('button#do_login').addClass('d-none');
@@ -258,13 +258,12 @@ $(document).ready(function() {
     // logout
     $('#do_logout').click(function() {
         $('body').css('cursor', 'progress');
-        let data = { csrfmiddlewaretoken: $('input[name=csrfmiddlewaretoken]').val() };
+        let form_data = {'csrfmiddlewaretoken': cookie.get('csrftoken') }
         $.ajax({
             type: 'POST',
-            data: data,
+            data: form_data,
             url:  './accounts/logout/',
             success: function(response) {
-                // TODO nötig, da der csrf-token nach dem anmelden geändert wird und ich mir erst den neuen holen muss.
                 window.open('./', '_self');
                 //$('button#do_logout').addClass('d-none');
                 //$('button#begin_edit').addClass('d-none');
@@ -289,7 +288,6 @@ $(document).ready(function() {
             $(this).click(function() {
                 save_settings();
 
-                let csrf_token  = $('input[name=csrfmiddlewaretoken]').val();
                 let value       = Number($(this).attr('value'));
                 let year        = Number($(this).parent('tr').attr('name'));
                 year           += (year == 99) ? 1900 : 2000; // TODO fix this before the end of 2098
@@ -302,7 +300,6 @@ $(document).ready(function() {
                 if (settings['exists'] === false) { circulation = 0; }
 
                 let data = {
-                    csrfmiddlewaretoken: csrf_token,
                     value:       value,
                     year:        year,
                     country:     country,
@@ -337,6 +334,7 @@ $(document).ready(function() {
                     if (response) {
                         data['name'] = response['name'].trim().substring(0, 79); }
                     $(td).css('cursor', 'progress');
+                    data['csrfmiddlewaretoken'] = cookie.get('csrftoken');
 
                     $.ajax({
                         type:     'POST',
diff --git a/coinmanager/coinc/templates/coinc/controlbar.html b/coinmanager/coinc/templates/coinc/controlbar.html
index d46291e..c7ec19d 100644
--- a/coinmanager/coinc/templates/coinc/controlbar.html
+++ b/coinmanager/coinc/templates/coinc/controlbar.html
@@ -1,6 +1,3 @@
-{% load cache %}
-{% csrf_token %}
-{% cache None controlbar user %}
     <style type="text/css">{% for user in users %}
       div.{{ user.name }} { background-color: {{ user.color }} !important; }{% endfor %}
     </style>
@@ -115,7 +112,6 @@
         </div>
       </div>
     </div>
-{% endcache %}
     <!-- modal login -->
     {% if not user.is_authenticated %}
     <div id="login" class="modal-container">
diff --git a/coinmanager/coinc/templates/coinc/year.html b/coinmanager/coinc/templates/coinc/year.html
index b6542e0..bee10a3 100644
--- a/coinmanager/coinc/templates/coinc/year.html
+++ b/coinmanager/coinc/templates/coinc/year.html
@@ -9,8 +9,8 @@
   </tr>
 {% endfor %}
 
-{% ifnotequal stamps|length 1 %}
+{% if stamps|length != 1 %}
   <tr>
     <td class="spacer" colspan="12"></td>
   </tr>
-{% endifnotequal %}
+{% endif %}
diff --git a/coinmanager/coinc/templates/header.html b/coinmanager/coinc/templates/header.html
index 3038a1d..a36565c 100644
--- a/coinmanager/coinc/templates/header.html
+++ b/coinmanager/coinc/templates/header.html
@@ -1,11 +1,9 @@
-{% load cache %}
-{% cache None header %}
 <!DOCTYPE html>
 <!--
 
   coinc - a simple coinmanager
 
-  Copyright (C) 2020 willipink.eu
+  Copyright (C) 2020-2022 willipink.eu
   Author Moritz Münch moritzmuench@mailbox.org
 
   This program is free software: you can redistribute it and/or modify
@@ -55,4 +53,3 @@
     <title>{{ title }}</title>
   </head>
   <body>
-{% endcache %}
diff --git a/coinmanager/coinc/templates/registration/login.html b/coinmanager/coinc/templates/registration/login.html
index b5a42c8..0c937cc 100644
--- a/coinmanager/coinc/templates/registration/login.html
+++ b/coinmanager/coinc/templates/registration/login.html
@@ -21,7 +21,6 @@
             </button>
           </div>
           <div class="modal-body">
-	{% csrf_token %}
             <div class="form-group">
               <label for="login_name">Name</label>
               <input type="text" name="username" id="login_name" class="form-control">
diff --git a/coinmanager/coinc/views.py b/coinmanager/coinc/views.py
index 5363065..e462dd7 100644
--- a/coinmanager/coinc/views.py
+++ b/coinmanager/coinc/views.py
@@ -1,6 +1,6 @@
 # encoding: utf-8
 #
-# Copyright (C) 2020 willipink.eu
+# Copyright (C) 2020-2022 willipink.eu
 # Author Moritz Münch moritzmuench@mailbox.org
 #
 # This program is free software: you can redistribute it and/or modify
@@ -26,6 +26,7 @@ from django.http import HttpResponse, Http404
 from django.template import loader
 from django.template.defaultfilters import register
 from django.views.decorators.http import condition
+from django.views.decorators.csrf import ensure_csrf_cookie
 from django.utils.datastructures import MultiValueDictKeyError
 
 from .models import Country, Stamp, Coin, User
@@ -52,6 +53,7 @@ def index(request):
     return HttpResponse(template.render(context, request))
 
 
+@ensure_csrf_cookie
 def detail_country(request, name_iso):
     ''' wrapper_view for a *single* country '''
 
@@ -300,7 +302,7 @@ def add_coin(request, country, year, value):
     else:
 
         name = request.POST.get('name')
-        name = str(name) if name else None
+        name = str(name) if name else ''
 
         found_by = request.POST.get('found_by')
         found_by = str(found_by) if found_by else None
diff --git a/coinmanager/coinmanager/production_settings.py b/coinmanager/coinmanager/production_settings.py
index 58b6a86..4c77780 100644
--- a/coinmanager/coinmanager/production_settings.py
+++ b/coinmanager/coinmanager/production_settings.py
@@ -44,9 +44,9 @@ INSTALLED_APPS = [
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
-#     'django.middleware.cache.UpdateCacheMiddleware',
+#     'django.middleware.cache.UpdateCacheMiddleware',          # per-site cache
     'django.middleware.common.CommonMiddleware',
-#     'django.middleware.cache.FetchFromCacheMiddleware',
+#     'django.middleware.cache.FetchFromCacheMiddleware',       # per-site cache
     'django.middleware.csrf.CsrfViewMiddleware',
 #     'django.middleware.http.ConditionalGetMiddleware',        # set 'ETag' and 'Last Modified' headers
     'django.contrib.auth.middleware.AuthenticationMiddleware',