diff --git a/src/queries/query.js b/src/queries/query.js
index 84693e4..24fc1ec 100644
--- a/src/queries/query.js
+++ b/src/queries/query.js
@@ -17,7 +17,7 @@ const addMember = (member, cb) => {
 };
 
 const addGithubUser = (user, cb) => {
-  dbConnection.query('INSERT INTO github_users (id, username, name, avatar_url, location, access_token) VALUES ($1, $2, $3, $4, $5, $6)', [user.id, user.username, user.name, user.avatar_url, user.location, user.access_token], cb);
+  dbConnection.query('INSERT INTO github_users (id, username, name, avatar_url, location, access_token) VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT (id) DO UPDATE SET username=$2, name=$3, avatar_url=$4, location=$5, access_token=$6;', [user.id, user.username, user.name, user.avatar_url, user.location, user.access_token], cb);
 };
 
 const getGithubUser = (id, cb) => {
diff --git a/src/server.js b/src/server.js
index 462c74c..e3b465f 100644
--- a/src/server.js
+++ b/src/server.js
@@ -6,12 +6,19 @@ const handlebars = require('handlebars');
 const jwt = require('hapi-auth-jwt2');
 const query = require('./queries/query.js');
 
-const server = new hapi.Server();
+const server = new hapi.Server({
+  connections: {
+    state: {
+      isSameSite: 'Lax'
+    }
+  }
+});
 
 server.connection({
   port: process.env.PORT || 4000
 });
 
+
 function validate(token, request, callback) {
   query.getGithubUser(token.user.id, (err, res) => {
     if (err) {