diff --git a/src/server/api.coffee b/src/server/api.coffee
index 7ad2e2330d..287b354f5d 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -20,6 +20,9 @@ NO_USER_FOUND = err: "No user found."
   $ mocha test/api.mocha.coffee
 ###
 
+router.get '/status', (req, res) ->
+  res.json status: 'up'
+
 auth = (req, res, next) ->
   uid = req.headers['x-api-user']
   token = req.headers['x-api-key']
@@ -36,9 +39,6 @@ auth = (req, res, next) ->
     req._isServer = true
     next()
 
-router.get '/status', (req, res) ->
-  res.json status: 'up'
-
 router.get '/user', auth, (req, res) ->
   user = req.userObj
 
@@ -46,7 +46,7 @@ router.get '/user', auth, (req, res) ->
 
   res.json user
 
-router.get '/task/:id', auth, (req, res) ->
+router.get '/user/task/:id', auth, (req, res) ->
   task = req.userObj.tasks[req.params.id]
   return res.json 400, err: "No task found." if !task || _.isEmpty(task)
 
@@ -82,7 +82,7 @@ validateTask = (req, res, next) ->
   req.task = task
   next()
 
-router.put '/task/:id', auth, validateTask, (req, res) ->
+router.put '/user/task/:id', auth, validateTask, (req, res) ->
   req.user.set "tasks.#{req.task.id}", req.task
 
   res.json 200, req.task
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 6dcbdaa2df..6d82d71516 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -104,9 +104,9 @@ describe 'API', ->
           expect(res.body).to.eql self
           done()
 
-    it 'GET /api/v1/task/:id', (done) ->
+    it 'GET /api/v1/user/task/:id', (done) ->
       tid = _.pluck(currentUser.tasks, 'id')[0]
-      request.get("#{baseURL}/task/#{tid}")
+      request.get("#{baseURL}/user/task/#{tid}")
         .set('Accept', 'application/json')
         .set('X-API-User', currentUser.id)
         .set('X-API-Key', currentUser.apiToken)
@@ -159,9 +159,9 @@ describe 'API', ->
             expect(user.get().tasks[res.body.id]).to.be.an('object')
             done()
 
-    it 'PUT /api/v1/task/:id', (done) ->
+    it 'PUT /api/v1/user/task/:id', (done) ->
       tid = _.pluck(currentUser.tasks, 'id')[0]
-      request.put("#{baseURL}/task/#{tid}")
+      request.put("#{baseURL}/user/task/#{tid}")
         .set('Accept', 'application/json')
         .set('X-API-User', currentUser.id)
         .set('X-API-Key', currentUser.apiToken)
@@ -173,10 +173,10 @@ describe 'API', ->
           expect(res.body).to.eql currentUser.tasks[tid]
           done()
 
-    it 'PUT /api/v1/task/:id (shouldnt update type)', (done) ->
+    it 'PUT /api/v1/user/task/:id (shouldnt update type)', (done) ->
       tid = _.pluck(currentUser.tasks, 'id')[1]
       type = if currentUser.tasks[tid].type is 'habit' then 'daily' else 'habit'
-      request.put("#{baseURL}/task/#{tid}")
+      request.put("#{baseURL}/user/task/#{tid}")
         .set('Accept', 'application/json')
         .set('X-API-User', currentUser.id)
         .set('X-API-Key', currentUser.apiToken)
@@ -188,9 +188,9 @@ describe 'API', ->
           expect(res.body).to.eql currentUser.tasks[tid]
           done()
 
-    it 'PUT /api/v1/task/:id (update notes)', (done) ->
+    it 'PUT /api/v1/user/task/:id (update notes)', (done) ->
       tid = _.pluck(currentUser.tasks, 'id')[2]
-      request.put("#{baseURL}/task/#{tid}")
+      request.put("#{baseURL}/user/task/#{tid}")
         .set('Accept', 'application/json')
         .set('X-API-User', currentUser.id)
         .set('X-API-Key', currentUser.apiToken)