diff --git a/package.json b/package.json
index 39c9d070..9a3aff45 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "scripts": {
         "start": "DEBUG=hackboard:* NODE_ENV=development nodemon --ignore gcp_creds.json ./bin/www.js",
-        "start-windows": "set DEBUG=hackboard:* && set NODE_ENV=test && nodemon --ignore gcp_creds.json ./bin/www.js",
+        "start-windows": "set DEBUG=hackboard:* && set NODE_ENV=development && nodemon --ignore gcp_creds.json ./bin/www.js",
         "deploy": "NODE_ENV=deployment node ./bin/www.js",
         "debug": "DEBUG=hackboard:* NODE_ENV=development nodemon --ignore gcp_creds.json ./bin/www.js",
         "test": "DEBUG=hackboard:* NODE_ENV=development mocha -r dotenv/config --reporter spec tests/**.js --exit",
diff --git a/services/database.service.js b/services/database.service.js
index f54bb007..72b355d2 100644
--- a/services/database.service.js
+++ b/services/database.service.js
@@ -28,9 +28,9 @@ function getUserFromEnvironment() {
 }
 
 function getPassFromEnvironment() {
-    return process.env.NODE_ENV === "development"
+    return env.isDevelopment()
         ? process.env.DB_PASS_DEV
-        : process.env.NODE_ENV === "deployment"
+        : env.isProduction()
         ? process.env.DB_PASS_DEPLOY
         : process.env.DB_PASS_TEST;
 }
diff --git a/services/env.service.js b/services/env.service.js
index 9b3d2091..182c51cc 100644
--- a/services/env.service.js
+++ b/services/env.service.js
@@ -12,7 +12,7 @@ module.exports = {
         return result;
     },
     isDevelopment: function() {
-        return process.env.NODE_ENV === "development";
+        return process.env.NODE_ENV.trim() === "development";
     },
     isProduction: function() {
         return process.env.NODE_ENV === "deployment";