diff --git a/app/views/header.blade.php b/app/views/header.blade.php
index 0303b6ad202f..4813ee4d6538 100755
--- a/app/views/header.blade.php
+++ b/app/views/header.blade.php
@@ -456,7 +456,7 @@
 	      	if (isStorageSupported()) {
 	  			@if (Auth::check() && !Auth::user()->registered)
 	        		localStorage.setItem('guest_key', '{{ Auth::user()->password }}');
-				@endif
+  				@endif
         	}
   	
 			@if (!Auth::check() || !Auth::user()->registered)
diff --git a/app/views/public/about_us.blade.php b/app/views/public/about_us.blade.php
index 2623fcf69e3a..f6552c2995d4 100644
--- a/app/views/public/about_us.blade.php
+++ b/app/views/public/about_us.blade.php
@@ -74,7 +74,7 @@
       <div class="col-md-3 center-block">
         <a href="#">
           <div class="cta">
-            <h2 onclick="getStarted()">Invoice Now <span>+</span></h2>
+            <h2 onclick="return getStarted()">Invoice Now <span>+</span></h2>
           </div>
         </a>
       </div>
diff --git a/app/views/public/contact_us.blade.php b/app/views/public/contact_us.blade.php
index d5f7cde55618..6f9d695baff2 100644
--- a/app/views/public/contact_us.blade.php
+++ b/app/views/public/contact_us.blade.php
@@ -53,18 +53,6 @@ var contactForm = {
   }
 };
 
-function isStorageSupported() {
-  try {
-    return 'localStorage' in window && window['localStorage'] !== null;
-  } catch (e) {
-    return false;
-  }
-}
-
-function getStarted() {
-  $('#startForm').submit();
-}
-
 </script>
 
 <section class="hero4" data-speed="2" data-type="background">
@@ -139,7 +127,7 @@ function getStarted() {
     <div class="col-md-3 center-block">
       <a href="#">
         <div class="cta">
-          <h2 onclick="getStarted()">Invoice Now <span>+</span></h2>
+          <h2 onclick="return getStarted()">Invoice Now <span>+</span></h2>
         </div>
       </a>
     </div>
diff --git a/app/views/public/header.blade.php b/app/views/public/header.blade.php
index 49f74f4b40f9..08983762017a 100644
--- a/app/views/public/header.blade.php
+++ b/app/views/public/header.blade.php
@@ -27,22 +27,31 @@
 
 
 <script>
-  $(document).ready(function () {
+  $(document).ready(function () {      
     if (isStorageSupported()) {
       $('[name="guest_key"]').val(localStorage.getItem('guest_key'));          
     }
   });
 
   function isStorageSupported() {
-    try {
-      return 'localStorage' in window && window['localStorage'] !== null;
-    } catch (e) {
+    if ('localStorage' in window && window['localStorage'] !== null) {
+      var storage = window.localStorage;
+    } else {
       return false;
     }
+    var testKey = 'test';
+    try {
+      storage.setItem(testKey, '1');
+      storage.removeItem(testKey);
+      return true;
+    } catch (error) {
+      return false;
+    }    
   }
 
   function getStarted() {
     $('#startForm').submit();
+    return false;
   }
 
 </script>    
diff --git a/app/views/public/splash.blade.php b/app/views/public/splash.blade.php
index 2a520e2e525c..e948438dd1dd 100755
--- a/app/views/public/splash.blade.php
+++ b/app/views/public/splash.blade.php
@@ -27,7 +27,7 @@
           <div class="col-md-3 center-block">
             <a href="#">
               <div class="cta">
-                <h2 id="startButton" onclick="getStarted()">Invoice Now <span>+</span></h2>
+                <h2 id="startButton" onclick="return getStarted()">Invoice Now <span>+</span></h2>
               </div>
             </a>
           </div>
@@ -102,7 +102,7 @@
               <div class="col-md-3 center-block">
                 <a href="#">
                   <div class="cta">
-                    <h2 onclick="getStarted()">Invoice Now <span>+</span></h2>
+                    <h2 onclick="return getStarted()">Invoice Now <span>+</span></h2>
                   </div>
                 </a>
               </div>
diff --git a/public/js/script.js b/public/js/script.js
index dbbaac137766..618670d40ba7 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -793,8 +793,6 @@ function GetReportTemplate1(doc, invoice, layout, checkMath)
 
 
 
-
-
 function GetReportTemplate2(doc, invoice, layout, checkMath)
 {
   var GlobalY=0;//Y position of line at current page