diff --git a/.vscode/launch.json b/.vscode/launch.json
index 81486b93841..f7f33fa8f60 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -38,6 +38,18 @@
         "--hg-key=$HGAPIKEY"
       ]
     },
+    {
+      "name": "Run Storage Server",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "${workspaceFolder}/pkg/cmd/grafana/",
+      "env": {
+        "GF_DEFAULT_TARGET": "storage-server"
+      },
+      "cwd": "${workspaceFolder}",
+      "args": ["server", "target", "--homepath", "${workspaceFolder}", "--packaging", "dev"]
+    },
     {
       "name": "Attach to Chrome",
       "port": 9222,
diff --git a/pkg/services/store/entity/db/dbimpl/dbimpl.go b/pkg/services/store/entity/db/dbimpl/dbimpl.go
index ff623fe999e..6d2402dfad6 100644
--- a/pkg/services/store/entity/db/dbimpl/dbimpl.go
+++ b/pkg/services/store/entity/db/dbimpl/dbimpl.go
@@ -69,7 +69,7 @@ func (db *EntityDB) GetEngine() (*xorm.Engine, error) {
 			}
 
 			connectionString := fmt.Sprintf(
-				"user=%s password=%s host=%s port=%s dbname=%s sslmode=%s", // sslcert=%s sslkey=%s sslrootcert=%s",
+				"user='%s' password='%s' host='%s' port='%s' dbname='%s' sslmode='%s'", // sslcert='%s' sslkey='%s' sslrootcert='%s'",
 				dbUser, dbPass, addr.Host, addr.Port, dbName, dbSslMode, // ss.dbCfg.ClientCertPath, ss.dbCfg.ClientKeyPath, ss.dbCfg.CaCertPath
 			)