diff --git a/.env.example b/.env.example
index b540b9be..710dadf6 100644
--- a/.env.example
+++ b/.env.example
@@ -28,6 +28,9 @@ MAIL_USERNAME=
 MAIL_PASSWORD=
 MAIL_ENCRYPTION=
 
+MAIL_FROM_NAME=
+MAIL_FROM_ADDRESS=
+
 PUSHER_APP_ID=
 PUSHER_KEY=
 PUSHER_SECRET=
diff --git a/app/Space/EnvironmentManager.php b/app/Space/EnvironmentManager.php
index a04cc5e6..8ae8200a 100755
--- a/app/Space/EnvironmentManager.php
+++ b/app/Space/EnvironmentManager.php
@@ -64,8 +64,6 @@ class EnvironmentManager
                 if ($entry[0] == $data_key) {
                     $env[$env_key] = $data_key.'='.$this->encode($data_value);
                     $updated = true;
-                } else {
-                    $env[$env_key] = $this->encode($env_value);
                 }
             }
 
@@ -90,7 +88,7 @@ class EnvironmentManager
     private function encode($str)
     {
 
-        if (strpos($str, ' ') !== false || preg_match('/'.preg_quote('^\'£$%^&*()}{@#~?><,@|-=-_+-¬', '/').'/', $str)) {
+        if ((strpos($str, ' ') !== false || preg_match('/'.preg_quote('^\'£$%^&*()}{@#~?><,@|-=-_+-¬', '/').'/', $str)) && ($str[0] != '"' || $str[strlen($str) - 1] != '"')) {
             $str = '"'.$str.'"';
         }