diff --git a/server/auth/account.js b/server/auth/account.js
index e6db72f..2dff079 100644
--- a/server/auth/account.js
+++ b/server/auth/account.js
@@ -4,7 +4,7 @@ const { accounts } = require('../database/models');
 const route = async (req, res) => {
 	const account = await accounts.findOne({
 		where: {
-			username: req.user.username
+			id: req.user.id
 		}
 	});
 
diff --git a/server/auth/deletion.js b/server/auth/deletion.js
index b15ebd5..feadc3d 100644
--- a/server/auth/deletion.js
+++ b/server/auth/deletion.js
@@ -11,7 +11,7 @@ const { accounts } = require('../database/models');
 const route = async (req, res) => {
 	const account = await accounts.findOne({
 		where: {
-			username: req.user.username
+			id: req.user.id
 		}
 	});
 
@@ -30,7 +30,7 @@ const route = async (req, res) => {
 	},
 	{
 		where: {
-			username: req.user.username
+			id: req.user.id
 		}
 	});
 
diff --git a/server/auth/login.js b/server/auth/login.js
index b2d5426..f116ad1 100644
--- a/server/auth/login.js
+++ b/server/auth/login.js
@@ -43,7 +43,7 @@ const route = async (req, res) => {
 	});
 
 	//generate the JWT
-	const tokens = generate(account.username, account.privilege);
+	const tokens = generate(account.id, account.username, account.privilege);
 
 	//finally
 	res.status(200).json(tokens);
diff --git a/server/auth/update.js b/server/auth/update.js
index d41fa4b..64acab1 100644
--- a/server/auth/update.js
+++ b/server/auth/update.js
@@ -16,7 +16,7 @@ const route = async (req, res) => {
 		hash: hash
 	}, {
 		where: {
-			username: req.user.username
+			id: req.user.id
 		}
 	});
 
diff --git a/server/server.js b/server/server.js
index 24d5bd3..2bed307 100644
--- a/server/server.js
+++ b/server/server.js
@@ -24,7 +24,7 @@ app.get('*', (req, res) => {
 });
 
 //startup
-server.listen(process.env.WEB_PORT || 3200, (err) => {
-	database.sync();
+server.listen(process.env.WEB_PORT || 3200, async (err) => {
+	await database.sync();
 	console.log(`listening to localhost:${process.env.WEB_PORT || 3200}`);
 });
diff --git a/server/utilities/token-destroy.js b/server/utilities/token-destroy.js
index 7481200..a73988a 100644
--- a/server/utilities/token-destroy.js
+++ b/server/utilities/token-destroy.js
@@ -3,7 +3,7 @@ const { tokens } = require('../database/models');
 module.exports = (token) => {
 	tokens.destroy({
 		where: {
-			token
+			token: token || ''
 		}
 	});
 }
\ No newline at end of file
diff --git a/server/utilities/token-generate.js b/server/utilities/token-generate.js
index d133a40..e47cfbc 100644
--- a/server/utilities/token-generate.js
+++ b/server/utilities/token-generate.js
@@ -2,14 +2,15 @@ const jwt = require('jsonwebtoken');
 const { tokens } = require('../database/models');
 
 //generates a JWT token based on the given arguments
-module.exports = (username, privilege) => {
+module.exports = (id, username, privilege) => {
 	const content = {
+		id,
 		username,
 		privilege
 	};
 
-	const accessToken = jwt.sign(content, process.env.SECRET_ACCESS, { expiresIn: '1m' });
-	const refreshToken = jwt.sign(content, process.env.SECRET_REFRESH);
+	const accessToken = jwt.sign(content, process.env.SECRET_ACCESS, { expiresIn: '10m' });
+	const refreshToken = jwt.sign(content, process.env.SECRET_REFRESH, { expiresIn: '30d' });
 
 	tokens.create({ token: refreshToken });
 
diff --git a/server/utilities/token-refresh.js b/server/utilities/token-refresh.js
index 24dd0f0..7231d53 100644
--- a/server/utilities/token-refresh.js
+++ b/server/utilities/token-refresh.js
@@ -11,7 +11,7 @@ module.exports = (token, callback) => {
 
 	const tokenRecord = tokens.findOne({
 		where: {
-			token
+			token: token || ''
 		}
 	});
 
@@ -24,7 +24,7 @@ module.exports = (token, callback) => {
 			return callback(403);
 		}
 
-		const result = generate(user.username, user.privilege);
+		const result = generate(user.id, user.username, user.privilege);
 
 		destroy(token);