diff --git a/src/server/serverRoutes.coffee b/src/server/serverRoutes.coffee
index de1ecc7bb7..d7256d9d47 100644
--- a/src/server/serverRoutes.coffee
+++ b/src/server/serverRoutes.coffee
@@ -33,7 +33,6 @@ module.exports = (expressApp, root, derby) ->
     return res.send(500, ":direction must be 'up' or 'down'") unless direction in ['up','down']
 
     model = req.getModel()
-    model.session.userId = uid
     model.fetch "users.#{uid}", (err, user) ->
       return res.send(500, err) if err
       userObj = user.get()
diff --git a/test/rest.casper.coffee b/test/rest.casper.coffee
index a57a5cb792..18aaf3afde 100644
--- a/test/rest.casper.coffee
+++ b/test/rest.casper.coffee
@@ -36,27 +36,30 @@ casper.thenOpen "#{url}/?play=1", ->
 
   # ---------- v1 ------------
 
-  @thenOpen "#{url}/users/#{user1.id}/tasks/#{taskId}/up", {
+  @thenOpen "#{url}/users/#{user2.id}/tasks/#{taskId}/up", {
     method: 'post',
     data: pomodoro
   }, ->
     result = JSON.parse @getPageContent()
-    @test.assertEqual user1.stats.hp, result.hp, 'REST +habit =hp'
-    @test.assert user1.stats.exp < result.exp, 'REST +habit +exp'
-    @test.assert user1.stats.money < result.money, 'REST +habit +money'
+    @test.assertEqual user2.stats.hp, result.hp, 'REST +habit =hp'
+    @test.assert user2.stats.exp < result.exp, 'REST +habit +exp'
+    @test.assert user2.stats.money < result.money, 'REST +habit +money'
     utils.dump result
 
-  @thenOpen "#{url}/users/#{user2.id}/tasks/#{taskId}/down", {
+  @thenOpen "#{url}/users/#{user1.id}/tasks/#{taskId}/down", {
     method: 'post',
     data: pomodoro
   }, ->
     result = JSON.parse @getPageContent()
-    @test.assert user2.stats.hp > result.hp, 'REST -habit -hp'
-    @test.assertEqual user2.stats.exp, result.exp, 'REST -habit =exp'
-    @test.assertEqual user2.stats.money, result.money, 'REST -habit =money'
+    @test.assert user1.stats.hp > result.hp, 'REST -habit -hp'
+    @test.assertEqual user1.stats.exp, result.exp, 'REST -habit =exp'
+    @test.assertEqual user1.stats.money, result.money, 'REST -habit =money'
     utils.dump result
 
-  @thenOpen ""
+casper.thenOpen "#{url}/?play=1", ->
+  # User2 is logged in by now. Make sure we don't get logged in as user1 since that was the last REST call
+  current = casper.evaluate -> window.DERBY.app.model.get('_user')
+  casper.then -> casper.test.assertEqual current.id, user2.id, "session remains user2's"
 
   # ---------- v2 ------------