diff --git a/paramecio2/app.py b/paramecio2/app.py
index ee91285..e42cd71 100644
--- a/paramecio2/app.py
+++ b/paramecio2/app.py
@@ -25,6 +25,11 @@ import sys
 import inspect
 from paramecio2.libraries.datetime import set_timezone
 
+swagger_app=False
+
+if hasattr(config, 'swagger_app'):
+    swagger_app=config.swagger_app
+
 def start_app():
     
     set_timezone()
@@ -121,4 +126,8 @@ def start_app():
                 
         return send_file(file_path)
 
+    if swagger_app:
+        from flasgger import Swagger
+        swagger=Swagger(app)
+
     return app
diff --git a/paramecio2/libraries/formsutils.py b/paramecio2/libraries/formsutils.py
index 1effddf..e74e7eb 100644
--- a/paramecio2/libraries/formsutils.py
+++ b/paramecio2/libraries/formsutils.py
@@ -172,7 +172,7 @@ def show_form(post, arr_form, t, yes_error=True, pass_values=True, modelform_tpl
     
     # Create csrf_token in session
     
-    generate_csrf()
+    #generate_csrf()
     
     if pass_values==True:
         pass_values_to_form(post, arr_form, yes_error, pass_values)
diff --git a/paramecio2/libraries/templates/forms/modelform.phtml b/paramecio2/libraries/templates/forms/modelform.phtml
index 57ba89c..01ecc82 100644
--- a/paramecio2/libraries/templates/forms/modelform.phtml
+++ b/paramecio2/libraries/templates/forms/modelform.phtml
@@ -23,5 +23,4 @@
             ${form.form()|n}
         % endif
     % endfor
-    ${csrf_token()|n}
 </div>
diff --git a/paramecio2/modules/admin/templates/login.phtml b/paramecio2/modules/admin/templates/login.phtml
index 085f3ae..2ff47e8 100644
--- a/paramecio2/modules/admin/templates/login.phtml
+++ b/paramecio2/modules/admin/templates/login.phtml
@@ -99,6 +99,7 @@
                 ${_('Paramecio Login')}
             </div>
             ${forms|n}
+            ${csrf_token()|n}
             <div class="form">
                 ${_('Remember login?')} <input type="checkbox" id="remember_login" name="remember_login" value="1">
             </div>
diff --git a/paramecio2/modules/admin/templates/register.phtml b/paramecio2/modules/admin/templates/register.phtml
index e42610a..83fa2e5 100644
--- a/paramecio2/modules/admin/templates/register.phtml
+++ b/paramecio2/modules/admin/templates/register.phtml
@@ -55,6 +55,7 @@
                 ${_('Paramecio Sign up')}
     </div>
     ${forms|n}
+    ${csrf_token()|n}
     <div id="result_register"></div>
     <div id="submit_block">
         <input type="submit" value="${_('Sign up')}" class="submit" id="register_submit"/>