diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 76f26ed26d997e79cdffebad639e2ace432580a0..d0d16ffc78f75dac7e610d22b4516171e2bd1cf5 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,8 @@ Changelog
 0.4.3 (12/28/2016)
 ------------------
 
+- Fix: issue `#186 <https://git.ziirish.me/ziirish/burp-ui/issues/186>`_
+- Fix: issue `#188 <https://git.ziirish.me/ziirish/burp-ui/issues/188>`_
 - Fix: issue `#190 <https://git.ziirish.me/ziirish/burp-ui/issues/190>`_
 - Fix: missing configuration in docker image
 - Fix: help troubleshooting some errors
diff --git a/burpui/app.py b/burpui/app.py
index 6271fab0779266bea39271259aef5764cf78ee30..4599670fd16bc19906d1bd8746aedbe6698e0423 100644
--- a/burpui/app.py
+++ b/burpui/app.py
@@ -298,6 +298,7 @@ def create_app(conf=None, verbose=0, logfile=None, gunicorn=True,
     app.config['CFG'] = None
 
     # Some config
+    app.config['BUI_CLI'] = cli
 
     # FIXME: strange behavior when bundling errors
     # app.config['BUNDLE_ERRORS'] = True
diff --git a/burpui/misc/backend/burp2.py b/burpui/misc/backend/burp2.py
index 5df232f17bf780a347aabe3fe1961cb5b1dd9e5a..7330f3aedcdf9d7a95a837f6afb3d954f23bec00 100644
--- a/burpui/misc/backend/burp2.py
+++ b/burpui/misc/backend/burp2.py
@@ -232,14 +232,15 @@ class Burp(Burp1):
         self.logger.info('includes: {}'.format(self.includes))
         self.logger.info('enforce: {}'.format(self.enforce))
         self.logger.info('revoke: {}'.format(self.revoke))
-        try:
-            # make the connection
-            self._spawn_burp(True)
-            self.status()
-        except BUIserverException:
-            pass
-        except OSError as exp:
-            self.logger.critical(str(exp))
+        if not self.app.config['BUI_CLI']:
+            try:
+                # make the connection
+                self._spawn_burp(True)
+                self.status()
+            except BUIserverException:
+                pass
+            except OSError as exp:
+                self.logger.critical(str(exp))
 
     def __exit__(self, typ, value, traceback):
         """try not to leave child process server side"""
diff --git a/burpui/translations/fr/LC_MESSAGES/messages.po b/burpui/translations/fr/LC_MESSAGES/messages.po
index d674c0a92703897dc18d051b07edfaf84412afc8..064a2d581f05f0666f399bd533c7266fb2d1e404 100644
--- a/burpui/translations/fr/LC_MESSAGES/messages.po
+++ b/burpui/translations/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-12-16 10:42+0100\n"
+"POT-Creation-Date: 2016-12-30 09:40+0100\n"
 "PO-Revision-Date: 2016-08-25 15:19+0200\n"
 "Last-Translator: Ziirish <hi+burpui@ziirish.me>\n"
 "Language: fr\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: burpui/app.py:481
+#: burpui/app.py:465
 msgid "Please log in to access this page."
 msgstr "Veuillez vous authentifier pour accéder à cette page."
 
-#: burpui/app.py:484
+#: burpui/app.py:468
 msgid "Please reauthenticate to access this page."
 msgstr "Veuillez vous ré-authentifier pour accéder à cette page."
 
@@ -59,6 +59,10 @@ msgstr "Connecté avec succès"
 msgid "Wrong username or password"
 msgstr "Mauvais nom d&#39;utilisateur ou mot de passe"
 
+#: burpui/routes.py:422
+msgid "Wrong CSRF token, please try again"
+msgstr "Mauvais token CSRF, veuillez réessayer"
+
 #: burpui/misc/parser/burp2.py:55
 msgid "max secs"
 msgstr "maximun secondes"
diff --git a/docs/manage.rst b/docs/manage.rst
index 6caf9275666c0bba46df653dd46b36826213eecc..9192d6caf5f78dc38e3dae365c77559807feadaa 100644
--- a/docs/manage.rst
+++ b/docs/manage.rst
@@ -79,7 +79,7 @@ You will also need some extra requirements:
 
 ::
 
-    pip install "burp-ui[sql]"
+    pip install --upgrade burp-ui-sql
 
 
 Then you just have to run the following command to have your database setup: