diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix
index 8c7ad9b91649..c38424c8e273 100644
--- a/nixos/modules/services/networking/toxvpn.nix
+++ b/nixos/modules/services/networking/toxvpn.nix
@@ -5,11 +5,7 @@ with lib;
 {
   options = {
     services.toxvpn = {
-      enable = mkOption {
-        type        = types.bool;
-        default     = false;
-        description = "enable toxvpn running on startup";
-      };
+      enable = mkEnableOption "enable toxvpn running on startup";
 
       localip = mkOption {
         type        = types.string;
@@ -43,6 +39,8 @@ with lib;
         Restart   = "on-success";
         Type      = "notify";
       };
+
+      restartIfChanged = false; # Likely to be used for remote admin
     };
 
     users.extraUsers = {
diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix
index 25d62ba04cc2..3b5627db2156 100644
--- a/pkgs/tools/networking/toxvpn/default.nix
+++ b/pkgs/tools/networking/toxvpn/default.nix
@@ -27,10 +27,11 @@ in stdenv.mkDerivation {
 
   cmakeFlags = [ "-DSYSTEMD=1" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A powerful tool that allows one to make tunneled point to point connections over Tox";
     homepage    = https://github.com/cleverca22/toxvpn;
     license     = licenses.gpl3;
+    maintainers = with maintainers; [ cleverca22 obadz ];
     platforms   = platforms.linux;
   };
 }