diff --git a/.gitignore b/.gitignore
index 3d46a93..0be62a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,9 @@
 # Application Insights config
 ApplicationInsights.config
 
+# SMTP configuration
+smtp.config
+
 # Publish Profiles
 [Pp]roperties/[Pp]ublish[Pp]rofiles/
 
diff --git a/Scripts/bfs.js b/Scripts/bfs.js
index aca9449..7428ed1 100644
--- a/Scripts/bfs.js
+++ b/Scripts/bfs.js
@@ -25,6 +25,10 @@ $(function () {
                 content.append(item);
 
                 search.after(content);
+
+                $(".panel-search a.list-group-item").click(function () {
+                    ga('send', 'pageview', '/api/GetSearchResult/?query=' + $("#search-input").val());
+                });
             });
         }, 200);
     });
diff --git a/Web.Release.config b/Web.Release.config
index 76a463b..3d785dd 100644
--- a/Web.Release.config
+++ b/Web.Release.config
@@ -28,13 +28,6 @@
       </customErrors>
     -->
   </system.web>
-  <system.net xdt:Transform="Insert">
-    <mailSettings>
-      <smtp deliveryMethod="Network" from="smtp@betawiki.net">
-        <network host="localhost" port="25" userName="smtp@betawiki.net" password="frEchEramejAQUVewrADE7uc" />
-      </smtp>
-    </mailSettings>
-  </system.net>
   <system.webServer>
     <modules>
       <remove name="ApplicationInsightsWebTracking" xdt:Transform="Insert" />
diff --git a/Web.config b/Web.config
index 9d81c06..634c31e 100644
--- a/Web.config
+++ b/Web.config
@@ -43,6 +43,11 @@
       <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Extensibility.Web.RequestTracking.WebRequestTrackingModule, Microsoft.ApplicationInsights.Extensibility.Web"/>
     </httpModules>
   </system.web>
+  <system.net>
+    <mailSettings>
+      <smtp configSource="smtp.config" />
+    </mailSettings>
+  </system.net>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>