diff --git a/modules/darwin/apps/homebrew.nix b/modules/darwin/apps/homebrew.nix
index e8c0dda..a97f99e 100644
--- a/modules/darwin/apps/homebrew.nix
+++ b/modules/darwin/apps/homebrew.nix
@@ -28,6 +28,7 @@
       "1Password for Safari" = 1569813296;
       "wireguard" = 1451685025;
       "wipr" = 1320666476;
+      "tailscale" = 1475387142;
     };
   };
 }
diff --git a/modules/darwin/apps/services.nix b/modules/darwin/apps/services.nix
index e847467..1c3b173 100644
--- a/modules/darwin/apps/services.nix
+++ b/modules/darwin/apps/services.nix
@@ -3,5 +3,5 @@
 {
   # Example: Tailscale, other system services
   services.nix-daemon.enable = true;
-  services.tailscale.enable = true;
+  # services.tailscale.enable = false;
 }
diff --git a/modules/darwin/system/system.nix b/modules/darwin/system/system.nix
index 984599f..2a3aae3 100644
--- a/modules/darwin/system/system.nix
+++ b/modules/darwin/system/system.nix
@@ -21,4 +21,9 @@
 
   system.defaults.WindowManager.EnableStandardClickToShowDesktop = false; # Disable/Enable standard click to show desktop
   # You can add more Mac defaults here as well...
+
+  system.activationScripts.postUserActivation.text = ''
+    # Following line should allow us to avoid a logout/login cycle
+    /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u
+  ''; # Activate settings after user activation
 }
\ No newline at end of file