diff --git a/CHANGES b/CHANGES
index da1d328c60..4403a9d74c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -48,6 +48,8 @@ Main changes compared to 7.0.3:
 * An issue with handling XRef URLs without scheme prefix has been addressed.
 * Various small usability improvements for the auth config page, empty list
   pages and the "Edit filter" icons.
+* Tags can now contain backslashes in the value and hyphens in the name
+  to allow using the special "smb-alert:file_path" task tag.
 
 
 gsa 7.0.3 (2018-03-28)
diff --git a/src/gsad.c b/src/gsad.c
index 9161987155..de60091844 100644
--- a/src/gsad.c
+++ b/src/gsad.c
@@ -1464,8 +1464,8 @@ init_validator ()
   openvas_validator_add (validator, "subject_type",  "^(group|role|user)$");
   openvas_validator_add (validator, "summary",    "^.{0,400}$");
   openvas_validator_add (validator, "tag_id",  "^[a-z0-9\\-]+$");
-  openvas_validator_add (validator, "tag_name",       "^[\\:-_[:alnum:], \\./]{1,80}$");
-  openvas_validator_add (validator, "tag_value",       "^[\\-_@[:alnum:], \\./]{0,200}$");
+  openvas_validator_add (validator, "tag_name",  "^[\\:\\-_[:alnum:], \\./]{1,80}$");
+  openvas_validator_add (validator, "tag_value", "^[\\-_@[:alnum:], \\.\\\\]{0,200}$");
   openvas_validator_add (validator, "target_id",  "^[a-z0-9\\-]+$");
   openvas_validator_add (validator, "task_id",    "^[a-z0-9\\-]+$");
   openvas_validator_add (validator, "term",       "^.{0,1000}");
diff --git a/src/gsad_omp.c b/src/gsad_omp.c
index 84a625949e..8f6f717953 100644
--- a/src/gsad_omp.c
+++ b/src/gsad_omp.c
@@ -8175,6 +8175,7 @@ append_alert_method_data (GString *xml, params_t *data, const char *method,
             || (strcmp (method, "SMB") == 0
                 && (strcmp (name, "smb_credential") == 0
                     || strcmp (name, "smb_file_path") == 0
+                    || strcmp (name, "smb_file_path_type") == 0
                     || strcmp (name, "smb_report_format") == 0
                     || strcmp (name, "smb_share_path") == 0))
             || (strcmp (method, "SNMP") == 0
diff --git a/src/html/classic/omp.xsl b/src/html/classic/omp.xsl
index c540d900ea..09fa67a07e 100644
--- a/src/html/classic/omp.xsl
+++ b/src/html/classic/omp.xsl
@@ -10841,6 +10841,16 @@ was created or assigned erroneously.
         <div class="form-group form-selection-item-method form-selection-item-method--smb">
           <label class="col-2 control-label"><xsl:value-of select="gsa:i18n ('File path')"/></label>
           <div class="col-10">
+            <div class="form-item radio">
+              <label class="radio-inline">
+                <input type="radio" name="method_data:smb_file_path_type" value="directory"/>
+                <xsl:value-of select="gsa:i18n ('Directory')"/>
+              </label>
+              <label class="radio-inline">
+                <input type="radio" name="method_data:smb_file_path_type" value="full" checked="1"/>
+                <xsl:value-of select="gsa:i18n ('Full path')"/>
+              </label>
+            </div>
             <div class="form-item">
               <input type="text" name="method_data:smb_file_path"
                 class="form-control"
@@ -12292,6 +12302,30 @@ was created or assigned erroneously.
         <div class="form-group form-selection-item-method form-selection-item-method--smb">
           <label class="col-2 control-label"><xsl:value-of select="gsa:i18n ('File Path')"/></label>
           <div class="col-10">
+            <div class="form-item radio">
+              <label class="radio-inline">
+                <xsl:choose>
+                  <xsl:when test="$method/data[name='smb_file_path_type']/text() = 'directory'">
+                    <input type="radio" name="method_data:smb_file_path_type" value="directory" checked="1"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <input type="radio" name="method_data:smb_file_path_type" value="directory"/>
+                  </xsl:otherwise>
+                </xsl:choose>
+                <xsl:value-of select="gsa:i18n ('Directory')"/>
+              </label>
+              <label class="radio-inline">
+                <xsl:choose>
+                  <xsl:when test="not ($method/data[name='smb_file_path_type']/text() != 'full')">
+                    <input type="radio" name="method_data:smb_file_path_type" value="full" checked="1"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <input type="radio" name="method_data:smb_file_path_type" value="full"/>
+                  </xsl:otherwise>
+                </xsl:choose>
+                <xsl:value-of select="gsa:i18n ('Full path')"/>
+              </label>
+            </div>
             <div class="form-item">
               <input name="method_data:smb_file_path"
                 class="form-control"