diff --git a/install/index.php b/install/index.php
index bd9e502d9..0d3977bb7 100755
--- a/install/index.php
+++ b/install/index.php
@@ -11,6 +11,8 @@
 $errors = array();
 $successes = array();
 
+$final = false;
+
 require_once('install_functions.php');
 
 if (isset($_GET['clean'])) {
@@ -49,7 +51,6 @@ else if (isset($_POST['install'])) {
         $errors[] = 'You must install twig before.';
     } else {
         $continue = true;
-        $final = false;
         $salt = generate_salt();
         $content = file_get_contents('inc/poche/config.inc.default.php');
 
diff --git a/themes/_global/js/saveLink.js b/themes/_global/js/saveLink.js
index a7acd84c3..b7dd7a34f 100755
--- a/themes/_global/js/saveLink.js
+++ b/themes/_global/js/saveLink.js
@@ -4,6 +4,8 @@ $.fn.ready(function() {
       $bagitForm = $('#bagit-form'),
       $bagitFormForm = $('#bagit-form-form');
 
+$("#tags2add").hide();
+
   /* ==========================================================================
    bag it link and close button
    ========================================================================== */
@@ -78,6 +80,14 @@ $.fn.ready(function() {
     event.preventDefault();
   });
 
+$('#showtaginput').click(function(){
+  $('#tags2add').toggle();
+  $('#plainurl').toggle();
+  $('#showtaginput').toggleClass('icon-tags');
+  $('#showtaginput').toggleClass('icon-check');
+});
+
+
   /* ==========================================================================
    Keyboard gestion
    ========================================================================== */
diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig
index bf2ae9037..85d338733 100755
--- a/themes/baggy/_pocheit-form.twig
+++ b/themes/baggy/_pocheit-form.twig
@@ -4,6 +4,10 @@
         <a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">&times;</a>
         <input type="hidden" name="autoclose" value="1" />
         <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
+        <div style="display:inline-block;cursor: pointer;" title="{% trans "Edit tags" %}" id="showtaginput" class="tool icon icon-tags">
+            <span>Add tags</span>
+        </div>
+        <input placeholder="tags, with commas" class="addurl" id="tags2add" name="tags" type="text"/>
         <span id="add-link-result"></span>
         <input type="submit" value="{% trans "save link!" %}" />
     </form>
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 54622cfce..b93a78b82 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -745,6 +745,9 @@ a.add-to-wallabag-link-after:after {
 .icon-evernote:before {
   content: "\e603";
 }
+.icon-tags:before {
+  content: "\e936";
+}
 
 
 /* .icon-image class, for image-based icons
diff --git a/themes/default/_pocheit-form.twig b/themes/default/_pocheit-form.twig
index 8c982db09..719913410 100755
--- a/themes/default/_pocheit-form.twig
+++ b/themes/default/_pocheit-form.twig
@@ -2,6 +2,10 @@
     <a href="javascript: void(null);" id="bagit-form-close">&nbsp;</a>
     <form method="get" action="index.php" id="bagit-form-form">
       <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
+      <div style="display:inline-block;cursor: pointer;" title="{% trans "Edit tags" %}" id="showtaginput" class="edit-tags">
+         <span id="showtaginput">Add tags</span>
+      </div>
+      <input placeholder="tags, with commas" class="addurl" id="tags2add" name="tags" type="text"/>
       <input type="submit" value="{% trans "save link!" %}" />
       <div id="add-link-result"></div>
     </form>
diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css
index 39a4df900..da8703f2b 100755
--- a/themes/default/css/style-default.css
+++ b/themes/default/css/style-default.css
@@ -75,3 +75,13 @@ a.print span {
 a.reload span {
     background-image: url('../img/default/reload.png');
 }
+.edit-tags span {
+    background-image: url('../img/default/tags.png');
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    /* Hide textual content */
+    overflow: hidden;
+    text-align: left;
+    text-indent: -9999px;
+}
diff --git a/themes/default/img/default/tags.png b/themes/default/img/default/tags.png
new file mode 100644
index 000000000..3714203e8
Binary files /dev/null and b/themes/default/img/default/tags.png differ