diff --git a/package-lock.json b/package-lock.json
index b6a669e..65d93d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "archery",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "archery",
-      "version": "0.2.0",
+      "version": "0.2.1",
       "license": "MIT",
       "dependencies": {
         "body-parser": "^2.2.0",
diff --git a/package.json b/package.json
index afdeedc..572d624 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "archery",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Build Arch packages through a web interface",
   "keywords": [
     "docker",
diff --git a/src/DB.ts b/src/DB.ts
index 150b6f2..4b1e937 100644
--- a/src/DB.ts
+++ b/src/DB.ts
@@ -216,6 +216,15 @@ class DB extends Store {
         return user.id;
     }
 
+    public async upsertUser(user: User): Promise<string> {
+        await this.user.upsert({
+            id: user.id,
+            username: user.username,
+            displayName: user.displayName || null
+        });
+        return user.id;
+    }
+
     public async createBuild(repo: string, commit: string, patch: string, distro: string, dependencies: string, author: string, uuid: string): Promise<number> {
         const buildRec = await this.build.create({
             repo,
diff --git a/src/Web.ts b/src/Web.ts
index 20986fd..dd386e3 100644
--- a/src/Web.ts
+++ b/src/Web.ts
@@ -331,10 +331,7 @@ class Web {
                 username: profile.username,
                 displayName: profile.displayName
             };
-            const user = await this.db.getUser(profile.id);
-            if (!user) {
-                await this.db.createUser(userObj);
-            }
+            await this.db.upsertUser(userObj);
             return cb(null, userObj);
         });
     }