diff --git a/js/main.js b/js/main.js
index 56158d7..ee291e4 100644
--- a/js/main.js
+++ b/js/main.js
@@ -42,7 +42,7 @@
              var socket = channel.open();
              socket.onopen = function () {
                  setInterval(function () {
-                     $.post(self.room_id + "/ping", {id : self.clientID}); 
+                     $.post(self.room_id + "/ping"); 
                  }, 1000 * 60);
 
                  self.onopen();
diff --git a/model.py b/model.py
index ffdfdcb..5834105 100644
--- a/model.py
+++ b/model.py
@@ -20,10 +20,6 @@ class Member(db.Model):
     def get_name(self):
         return self.nickname or self.key().name()
 
-    @classmethod
-    def by_client_id(klass, client_id):
-        return klass.all().filter("client_id =", client_id).get()
-
     @classmethod
     def get_by_room_and_user(klass, room, user):
         return klass.get_by_key_name(
diff --git a/room.py b/room.py
index cf30504..e9d65b7 100644
--- a/room.py
+++ b/room.py
@@ -128,10 +128,10 @@ def post(self, room_id):
 class Pong(RoomBase):
     def post(self, room_id):
         room = model.Room.get_by_key_name(room_id)
-        client_id = self.request.get('id')
+        user = self.get_user()
 
         room_service = service.RoomService(room)
-        room_service.ping(client_id)
+        room_service.ping_from(user)
 
         self.response.out.write("PONG\n")
 
diff --git a/service.py b/service.py
index a6d94d4..dcdd203 100644
--- a/service.py
+++ b/service.py
@@ -112,8 +112,8 @@ def set_name(self, user, new_name):
 
         self.notify_all({"event" : "member_changed"})
 
-    def ping(self, client_id):
-        member = model.Member.by_client_id(client_id)
+    def ping_from(self, user):
+        member = model.Member.get_by_room_and_user(self.room, user)
         member.date = datetime.datetime.now()
         member.put()