diff --git a/api/bin/www b/api/bin/www
index 5019ec62c..8118cf01b 100755
--- a/api/bin/www
+++ b/api/bin/www
@@ -22,8 +22,10 @@ app.set("port", port);
 /**
  * Connect to MongoDB
  **/
-
-var mongoDbUrl = process.env.MONGODB_URL || "mongodb://0.0.0.0/acebook";
+const dbUser = process.env.DB_USER;
+const dbPassword = process.env.DB_PW;
+const dbName = process.env.DB_NAME || 'farcebook';
+var mongoDbUrl = `mongodb+srv://${dbUser}:${dbPassword}@cluster0.8rfjmug.mongodb.net/${dbName}?retryWrites=true&w=majority`;
 mongoose.connect(mongoDbUrl, {
   useNewUrlParser: true,
   useUnifiedTopology: true,
diff --git a/api/models/token_generator.js b/api/models/token_generator.js
index b1acad7a0..8ac974658 100644
--- a/api/models/token_generator.js
+++ b/api/models/token_generator.js
@@ -1,4 +1,5 @@
 const JWT = require("jsonwebtoken");
+require('dotenv').config()
 const secret = process.env.JWT_SECRET;
 
 class TokenGenerator {
@@ -7,8 +8,8 @@ class TokenGenerator {
       user_id: user_id,
       iat: Math.floor(Date.now() / 1000),
       
-      // Set the JWT token to expire in 10 minutes
-      exp: Math.floor(Date.now() / 1000) + (30 * 60) // REAL LINE
+      // Set the JWT token to expire in 30 minutes
+      exp: Math.floor(Date.now() / 1000) + (30 * 60)
     }, secret);
   }
 }