diff --git a/templates/base.html b/templates/base.html
index e771e33..ee7bbf0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -35,11 +35,6 @@
                     <a class="nav-link" href="/urls">URLs</a>
                 </li>
             </ul>
-            <ul class="navbar-nav">
-                <li class="nav-item">
-                    <button id="enable-notifications" class="btn btn-outline-light">Enable Notifications</button>
-                </li>
-            </ul>
         </div>
     </nav>
 
@@ -60,20 +55,15 @@
     {% block scripts %}{% endblock %}
     <script>
         if ('serviceWorker' in navigator && 'PushManager' in window) {
-            let swRegistration = null;
             navigator.serviceWorker.register('{{ url_for("static", filename="service-worker.js") }}').then(function(registration) {
                 console.log('ServiceWorker registration successful with scope: ', registration.scope);
-                swRegistration = registration;
+                // Check if we should ask for permission
+                if (document.referrer.includes('/login') || (performance.navigation.type == performance.navigation.TYPE_RELOAD && new URLSearchParams(window.location.search).has('loggedin'))) {
+                    askPermission(registration);
+                }
             }, function(err) {
                 console.log('ServiceWorker registration failed: ', err);
             });
-
-            const enableNotificationsButton = document.getElementById('enable-notifications');
-            enableNotificationsButton.addEventListener('click', function() {
-                if (swRegistration) {
-                    askPermission(swRegistration);
-                }
-            });
         }
 
         function askPermission(registration) {