diff --git a/home/shared.nix b/home/shared.nix
index d965c59..02ce0e8 100644
--- a/home/shared.nix
+++ b/home/shared.nix
@@ -1,4 +1,6 @@
-{ ... }: {
+{ lib, pkgs, ... }: let
+  unstable = builtins.compareVersions pkgs.home-manager.version "unstable" >= 0;
+in {
 
   nixpkgs.config.allowUnfree = true;
   fonts.fontconfig.enable = true;
@@ -7,10 +9,13 @@
     home-manager.enable = true;
     git = {
       enable = true;
-      settings.user = {
+      settings.user = lib.mkIf (unstable) {
         name = "Random936";
         email = "randomdude936@gmail.com";
       };
+
+      userName = lib.mkIf (!unstable) "Random936";
+      userEmail = lib.mkIf (!unstable) "randomdude936@gmail.com";
     };
   };