diff --git a/resources/views/accounts/user_details.blade.php b/resources/views/accounts/user_details.blade.php
index 12b2a50a1048..928f519d21d4 100644
--- a/resources/views/accounts/user_details.blade.php
+++ b/resources/views/accounts/user_details.blade.php
@@ -168,8 +168,6 @@
             $('#passwordModal').on('shown.bs.modal', function () {
                 $('#current_password').focus();
            })
-
-            localStorage.setItem('auth_provider', '{{ strtolower($oauthProviderName) }}');
         });
 
         function showChangePassword() {
diff --git a/resources/views/clients/show.blade.php b/resources/views/clients/show.blade.php
index 1af453168de9..0394bc84f46c 100644
--- a/resources/views/clients/show.blade.php
+++ b/resources/views/clients/show.blade.php
@@ -302,7 +302,9 @@
         $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
           var target = $(e.target).attr("href") // activated tab
           target = target.substring(1);
-          localStorage.setItem('client_tab', target);
+          if (isStorageSupported()) {
+              localStorage.setItem('client_tab', target);
+          }
           if (!loadedTabs.hasOwnProperty(target)) {
             loadedTabs[target] = true;
             window['load_' + target]();
diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index 4620f93d9579..604ec38b29fb 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -106,7 +106,9 @@
   @endif
 
   function handleSignedUp() {
-      localStorage.setItem('guest_key', '');
+      if (isStorageSupported()) {
+          localStorage.setItem('guest_key', '');
+      }
       fbq('track', 'CompleteRegistration');
       trackEvent('/account', '/signed_up');
   }
@@ -157,10 +159,6 @@
     }
   }
 
-  function setSocialLoginProvider(provider) {
-    localStorage.setItem('auth_provider', provider);
-  }
-
   window.loadedSearchData = false;
   function onSearchBlur() {
       $('#search').typeahead('val', '');
@@ -338,7 +336,9 @@
             if (history.pushState) {
                 history.pushState(null, null, target);
             }
-            localStorage.setItem('last:settings_page', location.href.replace(location.hash, ''));
+            if (isStorageSupported()) {
+                localStorage.setItem('last:settings_page', location.href.replace(location.hash, ''));
+            }
         }
     });
 
@@ -666,7 +666,7 @@
                     <h4>{{ trans('texts.sign_up_using') }}</h4><br/>
                     @foreach (App\Services\AuthService::$providers as $provider)
                     <a href="{{ URL::to('auth/' . $provider) }}" class="btn btn-primary btn-block"
-                        onclick="setSocialLoginProvider('{{ strtolower($provider) }}')" id="{{ strtolower($provider) }}LoginButton">
+                        id="{{ strtolower($provider) }}LoginButton">
                         <i class="fa fa-{{ strtolower($provider) }}"></i> &nbsp;
                         {{ $provider }}
                     </a>