diff --git a/ajax/controller.php b/ajax/controller.php
index 823eec43..56069b44 100644
--- a/ajax/controller.php
+++ b/ajax/controller.php
@@ -61,6 +61,7 @@ class Controller {
 		
 		if ($esId){
 			$session = Session::getSession($esId);
+			// !TODO: return member_id here ???
 			\OCP\JSON::success($session);
 			exit();
 		}
diff --git a/ajax/otpoll.php b/ajax/otpoll.php
index d9ecf532..f7002e51 100644
--- a/ajax/otpoll.php
+++ b/ajax/otpoll.php
@@ -64,9 +64,15 @@ try{
 			exit();
 			break;
 		case 'join-session':
-			$response = "true"; // should fail when session is non-existent
+			OCA\Office\Controller::joinSession(array(
+				'es_id' => $request->getParam('args/es_id')
+			));
+			exit();
 			break;
 		case 'user-list':
+			$members = OCA\Office\Member::getMembersByEsId(
+					$request->getParam('args/es_id')
+			);
 			break;
 		case 'sync-ops':
 			$seqHead = $request->getParam('args/seq_head');
diff --git a/appinfo/database.xml b/appinfo/database.xml
index 55369a34..b45b1f58 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -60,7 +60,7 @@
 		<name>*dbprefix*office_member</name>
 		<declaration>
 			<field>
-				<name>member</name>
+				<name>member_id</name>
 				<type>integer</type>
 				<default>1</default>
 				<notnull>true</notnull>
diff --git a/lib/member.php b/lib/member.php
index 20393901..cb13e62c 100644
--- a/lib/member.php
+++ b/lib/member.php
@@ -29,7 +29,7 @@ class Member {
 	}
 
 	public static function getMember($id){
-		$query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_member` WHERE `member`= ?');
+		$query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_member` WHERE `member_id`= ?');
 		$result = $query->execute(array($id));
 		return $result->fetchRow();
 	}
@@ -42,7 +42,7 @@ class Member {
 		
 		$placeholders = array_fill(0, $memberCount, '?');
 		$stmt = implode(', ', $placeholders);
-		$query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_member` WHERE `member`IN (' . $stmt . ')');
+		$query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_member` WHERE `member_id`IN (' . $stmt . ')');
 		$result = $query->execute(array($ids));
 		return $result->fetchAll();
 	}
diff --git a/lib/op.php b/lib/op.php
index b8abba47..79a75be6 100644
--- a/lib/op.php
+++ b/lib/op.php
@@ -60,7 +60,6 @@ class Op {
 		if ($seq == ""){
 			$seq = -1;
 		}
-		$oplist = array();
 		$query = \OCP\DB::prepare('SELECT `opspec` FROM `*PREFIX*office_op`  WHERE `es_id`=? AND `seq`>? ORDER BY `seq` ASC');
 		$result = $query->execute(array($esId, $seq));
 		return $result->fetchAll();