diff --git a/README.md b/README.md
index 8d7d5de2..ba2a9286 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![StyleCI](https://styleci.io/repos/26730195/shield)](https://styleci.io/repos/26730195/)
 [![Build Status](https://img.shields.io/travis/CachetHQ/Cachet/master.svg?style=flat-square)](https://travis-ci.org/CachetHQ/Cachet)
 [![Software License](https://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat-square)](LICENSE)
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/cachet/localized.png)](http://translate.cachethq.io/project/cachet)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/cachet/localized.svg)](http://translate.cachethq.io/project/cachet)
 [![Packagist](https://img.shields.io/packagist/v/cachethq/cachet.svg?style=flat-square)](https://packagist.org/packages/cachethq/cachet)
 
 ![Screenshot](https://cachethq.io/img/main-interface.jpg)
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 6e3d5f27..ed289ec9 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -250,10 +250,11 @@ class SetupController extends Controller
         try {
             (new Dotenv($dir, $file))->load();
 
-            $envValue = env(strtoupper($key)) ?: 'null';
+            $envKey = strtoupper($key);
+            $envValue = env($envKey) ?: 'null';
 
             file_put_contents($path, str_replace(
-                $envValue, $value, file_get_contents($path)
+                $envKey.'='.$envValue, $envKey.'='.$value, file_get_contents($path)
             ));
         } catch (InvalidPathException $e) {
             //