diff --git a/keyserver/addons/opaque-ke-node/src/lib.rs b/keyserver/addons/opaque-ke-node/src/lib.rs
index 9e5436a7f..2a1f68164 100644
--- a/keyserver/addons/opaque-ke-node/src/lib.rs
+++ b/keyserver/addons/opaque-ke-node/src/lib.rs
@@ -1,202 +1,260 @@
 use argon2::Argon2;
 use digest::generic_array::GenericArray;
 use digest::Digest;
 use neon::prelude::*;
 use neon::types::buffer::TypedArray;
 use opaque_ke::ciphersuite::CipherSuite;
 use opaque_ke::errors::InternalPakeError;
 use opaque_ke::hash::Hash;
 use opaque_ke::slow_hash::SlowHash;
 use opaque_ke::{
-  ClientLogin, ClientLoginStartParameters, ClientRegistration,
-  ClientRegistrationFinishParameters, CredentialRequest, RegistrationRequest,
-  RegistrationResponse, RegistrationUpload,
+  ClientLogin, ClientLoginFinishParameters, ClientLoginStartParameters,
+  ClientRegistration, ClientRegistrationFinishParameters,
+  CredentialFinalization, CredentialRequest, CredentialResponse,
+  RegistrationRequest, RegistrationResponse, RegistrationUpload,
 };
 use rand::rngs::OsRng;
 
 struct Cipher;
 
 impl CipherSuite for Cipher {
   type Group = curve25519_dalek::ristretto::RistrettoPoint;
   type KeyExchange = opaque_ke::key_exchange::tripledh::TripleDH;
   type Hash = sha2::Sha512;
   type SlowHash = ArgonWrapper;
 }
 
 struct ArgonWrapper(Argon2<'static>);
 
 impl<D: Hash> SlowHash<D> for ArgonWrapper {
   fn hash(
     input: GenericArray<u8, <D as Digest>::OutputSize>,
   ) -> Result<Vec<u8>, InternalPakeError> {
     let params = Argon2::default();
     let mut output = vec![0u8; <D as Digest>::output_size()];
     params
       .hash_password_into(&input, &[0; argon2::MIN_SALT_LEN], &mut output)
       .map_err(|_| InternalPakeError::SlowHashError)?;
     Ok(output)
   }
 }
 
 struct ClientRegistrationStartResult {
   message: RegistrationRequest<Cipher>,
   state: ClientRegistration<Cipher>,
 }
 
 impl Finalize for ClientRegistrationStartResult {}
 
 struct ClientRegistrationFinishResult {
   message: RegistrationUpload<Cipher>,
 }
 
 impl Finalize for ClientRegistrationFinishResult {}
 
 struct ClientLoginStartResult {
   message: CredentialRequest<Cipher>,
   state: ClientLogin<Cipher>,
 }
 
 impl Finalize for ClientLoginStartResult {}
 
+struct ClientLoginFinishResult {
+  message: CredentialFinalization<Cipher>,
+  session_key: Vec<u8>,
+}
+
+impl Finalize for ClientLoginFinishResult {}
+
 fn client_register_start(
   mut cx: FunctionContext,
 ) -> JsResult<JsBox<ClientRegistrationStartResult>> {
   let password = cx.argument::<JsString>(0)?;
   let mut client_rng = OsRng;
   let client_registration_start_result = ClientRegistration::<Cipher>::start(
     &mut client_rng,
     password.value(&mut cx).as_bytes(),
   )
   .or_else(|err| cx.throw_error(err.to_string()))?;
   Ok(cx.boxed(ClientRegistrationStartResult {
     message: client_registration_start_result.message,
     state: client_registration_start_result.state,
   }))
 }
 
 fn get_registration_start_message_array(
   mut cx: FunctionContext,
 ) -> JsResult<JsArrayBuffer> {
   let client_registration_start_result =
     cx.argument::<JsBox<ClientRegistrationStartResult>>(0)?;
   Ok(JsArrayBuffer::external(
     &mut cx,
     client_registration_start_result.message.serialize(),
   ))
 }
 
 fn get_registration_start_state_array(
   mut cx: FunctionContext,
 ) -> JsResult<JsArrayBuffer> {
   let client_registration_start_result =
     cx.argument::<JsBox<ClientRegistrationStartResult>>(0)?;
   Ok(JsArrayBuffer::external(
     &mut cx,
     client_registration_start_result.state.serialize(),
   ))
 }
 
 fn client_register_finish(
   mut cx: FunctionContext,
 ) -> JsResult<JsBox<ClientRegistrationFinishResult>> {
   let client_register_state = cx.argument::<JsTypedArray<u8>>(0)?;
   let server_message = cx.argument::<JsTypedArray<u8>>(1)?;
   let client_registration = ClientRegistration::<Cipher>::deserialize(
     client_register_state.as_slice(&cx),
   )
   .or_else(|err| cx.throw_error(err.to_string()))?;
   let registration_response =
     RegistrationResponse::<Cipher>::deserialize(server_message.as_slice(&cx))
       .or_else(|err| cx.throw_error(err.to_string()))?;
 
   let mut client_rng = OsRng;
   let client_registration_finish_result = ClientRegistrationFinishResult {
     message: client_registration
       .finish(
         &mut client_rng,
         registration_response,
         ClientRegistrationFinishParameters::Default,
       )
       .or_else(|err| cx.throw_error(err.to_string()))?
       .message,
   };
   Ok(cx.boxed(client_registration_finish_result))
 }
 
 fn get_registration_finish_message_array(
   mut cx: FunctionContext,
 ) -> JsResult<JsArrayBuffer> {
   let client_registration_finish_result =
     cx.argument::<JsBox<ClientRegistrationFinishResult>>(0)?;
   Ok(JsArrayBuffer::external(
     &mut cx,
     client_registration_finish_result.message.serialize(),
   ))
 }
 
 fn client_login_start(
   mut cx: FunctionContext,
 ) -> JsResult<JsBox<ClientLoginStartResult>> {
   let password = cx.argument::<JsString>(0)?;
   let mut client_rng = OsRng;
   let client_login = ClientLogin::<Cipher>::start(
     &mut client_rng,
     password.value(&mut cx).as_bytes(),
     ClientLoginStartParameters::default(),
   )
   .or_else(|err| cx.throw_error(err.to_string()))?;
   Ok(cx.boxed(ClientLoginStartResult {
     message: client_login.message,
     state: client_login.state,
   }))
 }
 
 fn get_login_start_message_array(
   mut cx: FunctionContext,
 ) -> JsResult<JsArrayBuffer> {
   let client_login_start_result =
     cx.argument::<JsBox<ClientLoginStartResult>>(0)?;
   let login_start_message_vec =
     client_login_start_result
       .message
       .serialize()
       .or_else(|err| cx.throw_error(err.to_string()))?;
   Ok(JsArrayBuffer::external(&mut cx, login_start_message_vec))
 }
 
 fn get_login_start_state_array(
   mut cx: FunctionContext,
 ) -> JsResult<JsArrayBuffer> {
   let client_login_start_result =
     cx.argument::<JsBox<ClientLoginStartResult>>(0)?;
   let login_start_message_vec = client_login_start_result
     .state
     .serialize()
     .or_else(|err| cx.throw_error(err.to_string()))?;
   Ok(JsArrayBuffer::external(&mut cx, login_start_message_vec))
 }
 
+fn client_login_finish(
+  mut cx: FunctionContext,
+) -> JsResult<JsBox<ClientLoginFinishResult>> {
+  let client_login_state = cx.argument::<JsTypedArray<u8>>(0)?;
+  let server_message = cx.argument::<JsTypedArray<u8>>(1)?;
+  let client_login =
+    ClientLogin::<Cipher>::deserialize(client_login_state.as_slice(&cx))
+      .or_else(|err| cx.throw_error(err.to_string()))?;
+  let credential_response =
+    CredentialResponse::<Cipher>::deserialize(server_message.as_slice(&cx))
+      .or_else(|err| cx.throw_error(err.to_string()))?;
+  let client_login_finish = client_login
+    .finish(credential_response, ClientLoginFinishParameters::default())
+    .or_else(|err| cx.throw_error(err.to_string()))?;
+  Ok(cx.boxed(ClientLoginFinishResult {
+    message: client_login_finish.message,
+    session_key: client_login_finish.session_key,
+  }))
+}
+
+fn get_login_finish_message_array(
+  mut cx: FunctionContext,
+) -> JsResult<JsArrayBuffer> {
+  let client_login_finish_result =
+    cx.argument::<JsBox<ClientLoginFinishResult>>(0)?;
+  let login_finish_message_vec = client_login_finish_result
+    .message
+    .serialize()
+    .or_else(|err| cx.throw_error(err.to_string()))?;
+  Ok(JsArrayBuffer::external(&mut cx, login_finish_message_vec))
+}
+
+fn get_login_finish_session_array(
+  mut cx: FunctionContext,
+) -> JsResult<JsArrayBuffer> {
+  let client_login_finish_result =
+    cx.argument::<JsBox<ClientLoginFinishResult>>(0)?;
+  let login_finish_session_vec = client_login_finish_result.session_key.clone();
+  Ok(JsArrayBuffer::external(&mut cx, login_finish_session_vec))
+}
+
 #[neon::main]
 fn main(mut cx: ModuleContext) -> NeonResult<()> {
   cx.export_function("clientRegisterStart", client_register_start)?;
   cx.export_function(
     "getRegistrationStartMessageArray",
     get_registration_start_message_array,
   )?;
   cx.export_function(
     "getRegistrationStartStateArray",
     get_registration_start_state_array,
   )?;
   cx.export_function("clientRegisterFinish", client_register_finish)?;
   cx.export_function(
     "getRegistrationFinishMessageArray",
     get_registration_finish_message_array,
   )?;
   cx.export_function("clientLoginStart", client_login_start)?;
   cx.export_function(
     "getLoginStartMessageArray",
     get_login_start_message_array,
   )?;
   cx.export_function("getLoginStartStateArray", get_login_start_state_array)?;
+  cx.export_function("clientLoginFinish", client_login_finish)?;
+  cx.export_function(
+    "getLoginFinishMessageArray",
+    get_login_finish_message_array,
+  )?;
+  cx.export_function(
+    "getLoginFinishSessionArray",
+    get_login_finish_session_array,
+  )?;
   Ok(())
 }