diff --git a/.mikaela/ssh/config b/.mikaela/ssh/config
index 276028f1..a9f6096a 100644
--- a/.mikaela/ssh/config
+++ b/.mikaela/ssh/config
@@ -24,7 +24,7 @@ Host *
 
     # Send needed environment variables. I don't like setting wildcards
     # and LC_ALL is disabled on purpouse.
-    SendEnv LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION TERM TZ
+    SendEnv EDITOR LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION TERM TZ
 
     # If the server doesn't reply in "three" pings, connection is dead.
     # Defaults to 3 anyway, but I add it here for clearity and
diff --git a/etc/ssh/ssh_config b/etc/ssh/ssh_config
index e47858fc..bf14a7ae 100644
--- a/etc/ssh/ssh_config
+++ b/etc/ssh/ssh_config
@@ -25,7 +25,7 @@ Host *
 
     # Send needed environment variables. I don't like setting wildcards
     # and LC_ALL is disabled on purpouse.
-    SendEnv LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION TERM TZ
+    SendEnv EDITOR LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION TERM TZ
 
     # If the server doesn't reply in three "pings", connection is dead.
     # Defaults to 3 anyway, but I add it here for clearity and
diff --git a/etc/ssh/sshd_config b/etc/ssh/sshd_config
index 2ae1605d..cd4cb117 100644
--- a/etc/ssh/sshd_config
+++ b/etc/ssh/sshd_config
@@ -8,7 +8,7 @@
 
 # Allow the client to send needed environment variables. I don't like
 # setting wildcards and LC_ALL is disabled on purpouse.
-AcceptEnv LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION TERM TZ
+AcceptEnv EDITOR LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION TERM TZ
 
 # IPv4 & IPv6
 AddressFamily any