diff --git a/api/subscriptions.js b/api/subscriptions.js
index 6066fea..087f48a 100644
--- a/api/subscriptions.js
+++ b/api/subscriptions.js
@@ -9,10 +9,10 @@ mongoose.connect("mongodb://localhost:27017/vinlottis", {
   useNewUrlParser: true
 });
 
-const config = require(path.join(__dirname + "/../config/env/push"));
+const config = require(path.join(__dirname + "/../config/defaults/push"));
 const Subscription = require(path.join(__dirname + "/../schemas/Subscription"));
 const lotteryConfig = require(path.join(
-  __dirname + "/../config/env/lottery.config"
+  __dirname + "/../config/defaults/lottery"
 ));
 
 router.use((req, res, next) => {
diff --git a/config/defaults/lottery.js b/config/defaults/lottery.js
new file mode 100644
index 0000000..3cc602f
--- /dev/null
+++ b/config/defaults/lottery.js
@@ -0,0 +1,15 @@
+try {
+  module.exports = require("../env/lottery.config");
+} catch (e) {
+  console.error(
+    "You haven't defined lottery-configs, you sure you want to continue without them?"
+  );
+  module.exports = {
+    name: "NAME MISSING",
+    phone: "PHONE_MISSING",
+    price: 10,
+    message: "INSERT MESSAGE",
+    date: 5,
+    hours: 15
+  };
+}
diff --git a/config/env/push.js b/config/defaults/push.js
similarity index 80%
rename from config/env/push.js
rename to config/defaults/push.js
index ac90471..1385d11 100644
--- a/config/env/push.js
+++ b/config/defaults/push.js
@@ -1,5 +1,5 @@
 try {
-  module.exports = require("./push.config");
+  module.exports = require("../env/push.config");
 } catch (e) {
   console.error(
     "You haven't defined push-parameters, you sure you want to continue without them?"
diff --git a/config/service-worker.config.js b/config/service-worker.config.js
index 34533bd..d54fe56 100644
--- a/config/service-worker.config.js
+++ b/config/service-worker.config.js
@@ -42,7 +42,7 @@ const ServiceWorkerConfig = {
   plugins: [
     new webpack.DefinePlugin({
       __DATE__: new Date().getTime(),
-      __PUBLICKEY__: JSON.stringify(require("./env/push").publicKey)
+      __PUBLICKEY__: JSON.stringify(require("./defaults/push").publicKey)
     })
   ]
 };
diff --git a/config/webpack.config.common.js b/config/webpack.config.common.js
index 711bd56..26d6fbf 100644
--- a/config/webpack.config.common.js
+++ b/config/webpack.config.common.js
@@ -1,10 +1,9 @@
 "use strict";
 
-const env = require("./env/lottery.config.js");
+const env = require("./defaults/lottery");
 const webpack = require("webpack");
 const VueLoaderPlugin = require("vue-loader/lib/plugin");
 const MiniCSSExtractPlugin = require("mini-css-extract-plugin");
-const HtmlPlugin = require("html-webpack-plugin");
 const helpers = require("./helpers");
 
 const webpackConfig = function(isDev) {
@@ -79,7 +78,7 @@ const webpackConfig = function(isDev) {
         __MESSAGE__: JSON.stringify(env.message),
         __DATE__: env.date,
         __HOURS__: env.hours,
-        __PUSHENABLED__: JSON.stringify(require("./env/push") != false)
+        __PUSHENABLED__: JSON.stringify(require("./defaults/push") != false)
       })
     ]
   };