diff --git a/app/filters.php b/app/filters.php
index cd9f00324e9a..c52d5732e1b6 100755
--- a/app/filters.php
+++ b/app/filters.php
@@ -13,9 +13,12 @@
 
 App::before(function($request)
 {
-  $count = Session::get(SESSION_COUNTER, 0);
-  Session::put(SESSION_COUNTER, ++$count);
-  
+  if (Auth::check())
+  {
+    $count = Session::get(SESSION_COUNTER, 0);
+    Session::put(SESSION_COUNTER, ++$count);
+  }
+
   if (App::environment() == ENV_PRODUCTION)
   {
     if (!Request::secure()) 
diff --git a/app/models/User.php b/app/models/User.php
index 07bae4f74cf0..c27c8cd1ee63 100755
--- a/app/models/User.php
+++ b/app/models/User.php
@@ -127,6 +127,7 @@ class User extends ConfideUser implements UserInterface, RemindableInterface
 		}
 
 		$count = self::getRequestsCount();
+		
 		if ($count == 1 || $count % 5 == 0)
 		{
 			if (!Utils::isRegistered())
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index ed71207acfff..c38228c395a8 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -496,7 +496,14 @@
 				model.invoice().client().country = false;				
 			}
 			refreshPDF();
-		}); //.trigger('change');						
+		});
+
+		// If no clients exists show the client form when clicking on the client select input
+		if (clients.length === 0) {
+			$('.client_select input.form-control').on('click', function() {
+				model.showClientForm();
+			});
+		}		
 
 		$('#terms, #public_notes, #invoice_number, #invoice_date, #due_date, #po_number, #discount, #currency_id, #invoice_design_id, #recurring').change(function() {
 			setTimeout(function() {
diff --git a/app/views/public/about_us.blade.php b/app/views/public/about_us.blade.php
index a307c2e46d09..9d63c8d13e34 100644
--- a/app/views/public/about_us.blade.php
+++ b/app/views/public/about_us.blade.php
@@ -57,7 +57,7 @@
                     <a href="http://www.linkedin.com/profile/view?id=105143214" target="_blank"><img src="images/linkedin.svg" alt=""></a>
                     <a href="http://hillelcoren.com/" target="_blank"><img src="images/website.svg" alt="Website"></a>
                 </p>
-                <p>Hillel has been developing enterprise applications for 15 years. His open-source <a  href="http://www.adobe.com/cfusion/exchange/index.cfm?event=extensionDetail&extid=1721530" target="_blank">AutoComplete</a> component has been used by  thousands of developers around the world.</p>
+                <p>Hillel has been developing enterprise applications for 15 years. His open-source <a  href="http://hillelcoren.com/flex-autocomplete/" target="_blank">AutoComplete</a> component has been used by  thousands of developers around the world.</p>
             </div>
             <div class="col-md-3">
                 <div class="img-team">
diff --git a/public/js/script.js b/public/js/script.js
index 8109ab179dd3..39e39bb472d3 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -1537,7 +1537,6 @@ function displayInvoiceHeader(doc, invoice, layout) {
   {
     doc.text(taxX, layout.tableTop, invoiceLabels.tax);
   }
-
 }
 
 function displayInvoiceItems(doc, invoice, layout) {