diff --git a/server/api/user.js b/server/api/user.js
index e6f72fb5..77fdf41a 100644
--- a/server/api/user.js
+++ b/server/api/user.js
@@ -1,13 +1,8 @@
 // @flow
 import uuid from 'uuid';
 import Router from 'koa-router';
-<<<<<<< HEAD
 import { makePolicy, signPolicy, publicS3Endpoint } from '../utils/s3';
-=======
-
 import Event from '../models/Event';
-import { makePolicy, signPolicy } from '../utils/s3';
->>>>>>> Avatar upload
 import auth from './middlewares/authentication';
 import { presentUser } from '../presenters';
 
@@ -20,13 +15,12 @@ router.post('user.info', auth(), async ctx => {
 router.post('user.update', auth(), async ctx => {
   const { user } = ctx.state;
   const { name, avatarUrl } = ctx.body;
+  const endpoint = publicS3Endpoint();
 
   if (name) user.name = name;
   if (
     avatarUrl &&
-    avatarUrl.startsWith(
-      `${process.env.AWS_S3_UPLOAD_BUCKET_URL}uploads/${ctx.state.user.id}`
-    )
+    avatarUrl.startsWith(`${endpoint}/uploads/${ctx.state.user.id}`)
   )
     user.avatarUrl = avatarUrl;
   await user.save();