diff --git a/services/identity/src/service.rs b/services/identity/src/service.rs
index 7c028818a..82a14cd52 100644
--- a/services/identity/src/service.rs
+++ b/services/identity/src/service.rs
@@ -1,616 +1,629 @@
 use aws_sdk_dynamodb::output::GetItemOutput;
 use aws_sdk_dynamodb::Error as DynamoDBError;
 use chrono::Utc;
 use comm_opaque::Cipher;
 use constant_time_eq::constant_time_eq;
 use futures_core::Stream;
 use opaque_ke::{
   CredentialFinalization, CredentialRequest,
   RegistrationRequest as PakeRegistrationRequest, ServerLogin,
   ServerLoginStartParameters,
 };
 use opaque_ke::{RegistrationUpload, ServerRegistration};
 use rand::rngs::OsRng;
 use rand::{CryptoRng, Rng};
 use siwe::Message;
 use std::collections::{HashMap, HashSet};
 use std::pin::Pin;
 use tokio::sync::mpsc;
 use tokio_stream::{wrappers::ReceiverStream, StreamExt};
 use tonic::{Request, Response, Status};
 use tracing::{error, info, instrument};
 
 use crate::config::CONFIG;
 use crate::constants::MPSC_CHANNEL_BUFFER_CAPACITY;
 use crate::database::{DatabaseClient, Error as DBError};
 use crate::nonce::generate_nonce_data;
 use crate::token::{AccessTokenData, AuthType};
 
 pub use proto::identity_service_server::IdentityServiceServer;
 use proto::{
   get_user_id_request::AuthType as ProtoAuthType,
   identity_service_server::IdentityService,
   login_request::Data::PakeLoginRequest,
   login_request::Data::WalletLoginRequest,
   login_response::Data::PakeLoginResponse,
   login_response::Data::WalletLoginResponse,
   pake_login_request::Data::PakeCredentialFinalization,
   pake_login_request::Data::PakeCredentialRequestAndUserId,
   pake_login_response::Data::AccessToken,
   pake_login_response::Data::PakeCredentialResponse,
   registration_request::Data::PakeCredentialFinalization as PakeRegistrationCredentialFinalization,
   registration_request::Data::PakeRegistrationRequestAndUserId,
   registration_request::Data::PakeRegistrationUploadAndCredentialRequest,
   registration_response::Data::PakeLoginResponse as PakeRegistrationLoginResponse,
   registration_response::Data::PakeRegistrationResponse, CompareUsersRequest,
   CompareUsersResponse, DeleteUserRequest, DeleteUserResponse,
   GenerateNonceRequest, GenerateNonceResponse,
   GetSessionInitializationInfoRequest, GetSessionInitializationInfoResponse,
   GetUserIdRequest, GetUserIdResponse, LoginRequest, LoginResponse,
   PakeLoginRequest as PakeLoginRequestStruct,
   PakeLoginResponse as PakeLoginResponseStruct, RegistrationRequest,
   RegistrationResponse, SessionInitializationInfo, VerifyUserTokenRequest,
   VerifyUserTokenResponse, WalletLoginRequest as WalletLoginRequestStruct,
   WalletLoginResponse as WalletLoginResponseStruct,
 };
 
 mod proto {
   tonic::include_proto!("identity");
 }
 
 mod login;
 mod registration;
 
 #[derive(Debug)]
 enum PakeWorkflow {
   Registration,
   Login,
 }
 
 #[derive(derive_more::Constructor)]
 pub struct MyIdentityService {
   client: DatabaseClient,
 }
 
 #[tonic::async_trait]
 impl IdentityService for MyIdentityService {
   type RegisterUserStream = Pin<
     Box<
       dyn Stream<Item = Result<RegistrationResponse, Status>> + Send + 'static,
     >,
   >;
 
   #[instrument(skip(self))]
   async fn register_user(
     &self,
     request: Request<tonic::Streaming<RegistrationRequest>>,
   ) -> Result<Response<Self::RegisterUserStream>, Status> {
     let mut in_stream = request.into_inner();
     let (tx, rx) = mpsc::channel(MPSC_CHANNEL_BUFFER_CAPACITY);
-    let first_message = in_stream.next().await;
-    let mut registration_state = registration::handle_registration_request(
-      first_message,
-      self.client.clone(),
-      tx.clone(),
-    )
-    .await?;
-    // ServerRegistration in opaque-ke v1.2 doesn't implement Clone, so we
-    // have to take the value out of registration_state, replacing it with None
-    let pake_state =
-      if let Some(pake_state) = registration_state.pake_state.take() {
-        pake_state
-      } else {
-        error!("registration_state is missing opaque-ke ServerRegistration");
-        return Err(Status::failed_precondition("internal error"));
-      };
-    let second_message = in_stream.next().await;
-    let server_login =
-      registration::handle_registration_upload_and_credential_request(
-        second_message,
+    let client = self.client.clone();
+
+    tokio::spawn(async move {
+      let first_message = in_stream.next().await;
+      let mut registration_state = registration::handle_registration_request(
+        first_message,
+        &client,
         tx.clone(),
-        &self.client,
+      )
+      .await?;
+      // ServerRegistration in opaque-ke v1.2 doesn't implement Clone, so we
+      // have to take the value out of registration_state, replacing it with None
+      let pake_state =
+        if let Some(pake_state) = registration_state.pake_state.take() {
+          pake_state
+        } else {
+          error!("registration_state is missing opaque-ke ServerRegistration");
+          return Err(Status::failed_precondition("internal error"));
+        };
+      let second_message = in_stream.next().await;
+      let server_login =
+        registration::handle_registration_upload_and_credential_request(
+          second_message,
+          tx.clone(),
+          &client,
+          &registration_state,
+          pake_state,
+        )
+        .await?;
+      let third_message = in_stream.next().await;
+      registration::handle_credential_finalization(
+        third_message,
+        tx,
+        &client,
         &registration_state,
-        pake_state,
+        server_login,
       )
       .await?;
-    let third_message = in_stream.next().await;
-    registration::handle_credential_finalization(
-      third_message,
-      tx,
-      &self.client,
-      &registration_state,
-      server_login,
-    )
-    .await?;
+      Ok(())
+    });
 
     let out_stream = ReceiverStream::new(rx);
     Ok(Response::new(
       Box::pin(out_stream) as Self::RegisterUserStream
     ))
   }
 
   type LoginUserStream =
     Pin<Box<dyn Stream<Item = Result<LoginResponse, Status>> + Send + 'static>>;
 
   #[instrument(skip(self))]
   async fn login_user(
     &self,
     request: Request<tonic::Streaming<LoginRequest>>,
   ) -> Result<Response<Self::LoginUserStream>, Status> {
     let mut in_stream = request.into_inner();
     let (tx, rx) = mpsc::channel(MPSC_CHANNEL_BUFFER_CAPACITY);
-
-    let first_message = in_stream.next().await;
-    let login_state =
-      login::handle_login_request(first_message, tx.clone(), &self.client)
+    let client = self.client.clone();
+
+    tokio::spawn(async move {
+      let first_message = in_stream.next().await;
+      let login_state =
+        login::handle_login_request(first_message, tx.clone(), &client).await?;
+
+      // login_state will be None if user is logging in with a wallet
+      if let Some(state) = login_state {
+        let second_message = in_stream.next().await;
+        login::handle_credential_finalization(
+          second_message,
+          tx,
+          &client,
+          state,
+        )
         .await?;
-
-    // login_state will be None if user is logging in with a wallet
-    if let Some(state) = login_state {
-      let second_message = in_stream.next().await;
-      login::handle_credential_finalization(
-        second_message,
-        tx,
-        self.client.clone(),
-        state,
-      )
-      .await?;
-    }
+      }
+      Ok::<(), Status>(())
+    });
 
     let out_stream = ReceiverStream::new(rx);
     Ok(Response::new(Box::pin(out_stream) as Self::LoginUserStream))
   }
 
   #[instrument(skip(self))]
   async fn verify_user_token(
     &self,
     request: Request<VerifyUserTokenRequest>,
   ) -> Result<Response<VerifyUserTokenResponse>, Status> {
     info!("Received VerifyUserToken request: {:?}", request);
     let message = request.into_inner();
     let token_valid = match self
       .client
       .get_access_token_data(message.user_id, message.signing_public_key)
       .await
     {
       Ok(Some(access_token_data)) => constant_time_eq(
         access_token_data.access_token.as_bytes(),
         message.access_token.as_bytes(),
       ),
       Ok(None) => false,
       Err(e) => return Err(handle_db_error(e)),
     };
     let response = Response::new(VerifyUserTokenResponse { token_valid });
     info!("Sending VerifyUserToken response: {:?}", response);
     Ok(response)
   }
 
   #[instrument(skip(self))]
   async fn get_user_id(
     &self,
     request: Request<GetUserIdRequest>,
   ) -> Result<Response<GetUserIdResponse>, Status> {
     let message = request.into_inner();
     let auth_type = match ProtoAuthType::from_i32(message.auth_type) {
       Some(ProtoAuthType::Password) => AuthType::Password,
       Some(ProtoAuthType::Wallet) => AuthType::Wallet,
       None => {
         error!(
           "Unable to parse AuthType from message: {}",
           message.auth_type
         );
         return Err(Status::invalid_argument("invalid message"));
       }
     };
     let user_id = match self
       .client
       .get_user_id_from_user_info(message.user_info, auth_type)
       .await
     {
       Ok(Some(user_id)) => user_id,
       Ok(None) => return Err(Status::not_found("no user ID found")),
       Err(e) => return Err(handle_db_error(e)),
     };
     let response = Response::new(GetUserIdResponse { user_id });
     Ok(response)
   }
 
   #[instrument(skip(self))]
   async fn delete_user(
     &self,
     request: tonic::Request<DeleteUserRequest>,
   ) -> Result<tonic::Response<DeleteUserResponse>, tonic::Status> {
     let message = request.into_inner();
     match self.client.delete_user(message.user_id).await {
       Ok(_) => Ok(Response::new(DeleteUserResponse {})),
       Err(e) => Err(handle_db_error(e)),
     }
   }
 
   #[instrument(skip(self))]
   async fn compare_users(
     &self,
     request: Request<CompareUsersRequest>,
   ) -> Result<Response<CompareUsersResponse>, Status> {
     let message = request.into_inner();
     let mut mysql_users_vec = message.users;
     let mut ddb_users_vec = match self.client.get_users().await {
       Ok(user_list) => user_list,
       Err(e) => return Err(handle_db_error(e)),
     };
     // We use HashSets here for faster lookups
     let mysql_users_set = HashSet::<String>::from_iter(mysql_users_vec.clone());
     let ddb_users_set = HashSet::<String>::from_iter(ddb_users_vec.clone());
 
     ddb_users_vec.retain(|user| !mysql_users_set.contains(user));
     mysql_users_vec.retain(|user| !ddb_users_set.contains(user));
     Ok(Response::new(CompareUsersResponse {
       users_missing_from_keyserver: ddb_users_vec,
       users_missing_from_identity: mysql_users_vec,
     }))
   }
 
   #[instrument(skip(self))]
   async fn generate_nonce(
     &self,
     _request: Request<GenerateNonceRequest>,
   ) -> Result<Response<GenerateNonceResponse>, Status> {
     let nonce_data = generate_nonce_data(&mut OsRng);
     match self
       .client
       .add_nonce_to_nonces_table(nonce_data.clone())
       .await
     {
       Ok(_) => Ok(Response::new(GenerateNonceResponse {
         nonce: nonce_data.nonce,
       })),
       Err(e) => Err(handle_db_error(e)),
     }
   }
 
   #[instrument(skip(self))]
   async fn get_session_initialization_info(
     &self,
     request: Request<GetSessionInitializationInfoRequest>,
   ) -> Result<Response<GetSessionInitializationInfoResponse>, Status> {
     let message = request.into_inner();
     match self
       .client
       .get_session_initialization_info(&message.user_id)
       .await
     {
       Ok(Some(session_initialization_info)) => {
         let mut devices = HashMap::new();
         for (device, info) in session_initialization_info {
           devices.insert(device, SessionInitializationInfo { info });
         }
         Ok(Response::new(GetSessionInitializationInfoResponse {
           devices,
         }))
       }
       Ok(None) => return Err(Status::not_found("user not found")),
       Err(e) => Err(handle_db_error(e)),
     }
   }
 }
 
 async fn put_token_helper(
   client: &DatabaseClient,
   auth_type: AuthType,
   user_id: &str,
   signing_public_key: &str,
   rng: &mut (impl Rng + CryptoRng),
 ) -> Result<String, Status> {
   if user_id.is_empty() || signing_public_key.is_empty() {
     error!(
       "Incomplete data: user ID \"{}\", signing public key \"{}\"",
       user_id, signing_public_key
     );
     return Err(Status::aborted("user not found"));
   }
   let access_token_data = AccessTokenData::new(
     user_id.to_string(),
     signing_public_key.to_string(),
     auth_type,
     rng,
   );
   match client
     .put_access_token_data(access_token_data.clone())
     .await
   {
     Ok(_) => Ok(access_token_data.access_token),
     Err(e) => Err(handle_db_error(e)),
   }
 }
 
 fn parse_and_verify_siwe_message(
   user_id: &str,
   signing_public_key: &str,
   siwe_message: &str,
   siwe_signature: Vec<u8>,
 ) -> Result<(), Status> {
   if user_id.is_empty() || signing_public_key.is_empty() {
     error!(
       "Incomplete data: user ID {}, signing public key {}",
       user_id, signing_public_key
     );
     return Err(Status::aborted("user not found"));
   }
   let siwe_message: Message = match siwe_message.parse() {
     Ok(m) => m,
     Err(e) => {
       error!("Failed to parse SIWE message: {}", e);
       return Err(Status::invalid_argument("invalid message"));
     }
   };
   match siwe_message.verify(
     match siwe_signature.try_into() {
       Ok(s) => s,
       Err(e) => {
         error!("Conversion to SIWE signature failed: {:?}", e);
         return Err(Status::invalid_argument("invalid message"));
       }
     },
     None,
     None,
     Some(&Utc::now()),
   ) {
     Err(e) => {
       error!(
         "Signature verification failed for user {} with signing public key {}: {}",
         user_id, signing_public_key, e
       );
       Err(Status::unauthenticated("message not authenticated"))
     }
     Ok(_) => Ok(()),
   }
 }
 
 async fn wallet_login_helper(
   client: &DatabaseClient,
   wallet_login_request: WalletLoginRequestStruct,
   rng: &mut (impl Rng + CryptoRng),
 ) -> Result<LoginResponse, Status> {
   parse_and_verify_siwe_message(
     &wallet_login_request.user_id,
     &wallet_login_request.signing_public_key,
     &wallet_login_request.siwe_message,
     wallet_login_request.siwe_signature,
   )?;
   client
     .update_users_table(
       wallet_login_request.user_id.clone(),
       Some(wallet_login_request.signing_public_key.clone()),
       None,
       None,
       Some(
         &wallet_login_request
           .session_initialization_info
           .ok_or_else(|| Status::invalid_argument("Invalid message"))?
           .info,
       ),
     )
     .await
     .map_err(handle_db_error)?;
   Ok(LoginResponse {
     data: Some(WalletLoginResponse(WalletLoginResponseStruct {
       access_token: put_token_helper(
         client,
         AuthType::Wallet,
         &wallet_login_request.user_id,
         &wallet_login_request.signing_public_key,
         rng,
       )
       .await?,
     })),
   })
 }
 
 async fn pake_login_start(
   client: &DatabaseClient,
   user_id: &str,
   pake_credential_request: &[u8],
 ) -> Result<LoginResponseAndPakeState, Status> {
   if user_id.is_empty() {
     error!("Incomplete data: user ID not provided");
     return Err(Status::aborted("user not found"));
   }
   let server_registration =
     match client.get_pake_registration(user_id.to_string()).await {
       Ok(Some(r)) => r,
       Ok(None) => {
         return Err(Status::not_found("user not found"));
       }
       Err(e) => return Err(handle_db_error(e)),
     };
   let credential_request =
     CredentialRequest::deserialize(pake_credential_request).map_err(|e| {
       error!("Failed to deserialize credential request: {}", e);
       Status::invalid_argument("invalid message")
     })?;
   match ServerLogin::start(
     &mut OsRng,
     server_registration,
     CONFIG.server_keypair.private(),
     credential_request,
     ServerLoginStartParameters::default(),
   ) {
     Ok(server_login_start_result) => Ok(LoginResponseAndPakeState {
       response: PakeLoginResponseStruct {
         data: Some(PakeCredentialResponse(
           server_login_start_result.message.serialize().map_err(|e| {
             error!("Failed to serialize PAKE message: {}", e);
             Status::failed_precondition("internal error")
           })?,
         )),
       },
       pake_state: server_login_start_result.state,
     }),
     Err(e) => {
       error!(
         "Encountered a PAKE protocol error when starting login: {}",
         e
       );
       Err(Status::aborted("server error"))
     }
   }
 }
 
 async fn pake_login_finish(
   user_id: &str,
   signing_public_key: &str,
   client: &DatabaseClient,
   server_login: ServerLogin<Cipher>,
   pake_credential_finalization: &[u8],
   rng: &mut (impl Rng + CryptoRng),
   pake_workflow: PakeWorkflow,
   session_initialization_info: &HashMap<String, String>,
 ) -> Result<PakeLoginResponseStruct, Status> {
   if user_id.is_empty() || signing_public_key.is_empty() {
     error!(
       "Incomplete data: user ID {}, signing public key {}",
       user_id, signing_public_key
     );
     return Err(Status::aborted("user not found"));
   }
   server_login
     .finish(
       CredentialFinalization::deserialize(pake_credential_finalization)
         .map_err(|e| {
           error!("Failed to deserialize credential finalization bytes: {}", e);
           Status::aborted("login failed")
         })?,
     )
     .map_err(|e| {
       error!(
         "Encountered a PAKE protocol error when finishing login: {}",
         e
       );
       Status::aborted("server error")
     })?;
   if matches!(pake_workflow, PakeWorkflow::Login) {
     client
       .update_users_table(
         user_id.to_string(),
         Some(signing_public_key.to_string()),
         None,
         None,
         Some(session_initialization_info),
       )
       .await
       .map_err(handle_db_error)?;
   }
   Ok(PakeLoginResponseStruct {
     data: Some(AccessToken(
       put_token_helper(
         client,
         AuthType::Password,
         user_id,
         signing_public_key,
         rng,
       )
       .await?,
     )),
   })
 }
 
 async fn pake_registration_start(
   rng: &mut (impl Rng + CryptoRng),
   registration_request_bytes: &[u8],
 ) -> Result<RegistrationResponseAndPakeState, Status> {
   match ServerRegistration::<Cipher>::start(
     rng,
-    PakeRegistrationRequest::deserialize(registration_request_bytes).unwrap(),
+    PakeRegistrationRequest::deserialize(registration_request_bytes).map_err(
+      |e| {
+        error!("Failed to deserialize registration request bytes: {}", e);
+        Status::aborted("registration failed")
+      },
+    )?,
     CONFIG.server_keypair.public(),
   ) {
     Ok(server_registration_start_result) => {
       Ok(RegistrationResponseAndPakeState {
         response: RegistrationResponse {
           data: Some(PakeRegistrationResponse(
             server_registration_start_result.message.serialize(),
           )),
         },
         pake_state: server_registration_start_result.state,
       })
     }
     Err(e) => {
       error!(
         "Encountered a PAKE protocol error when starting registration: {}",
         e
       );
       Err(Status::aborted("server error"))
     }
   }
 }
 
 async fn pake_registration_finish(
   user_id: &str,
   client: &DatabaseClient,
   registration_upload_bytes: &[u8],
   server_registration: Option<ServerRegistration<Cipher>>,
   username: &str,
   signing_public_key: &str,
   session_initialization_info: &HashMap<String, String>,
 ) -> Result<(), Status> {
   if user_id.is_empty() {
     error!("Incomplete data: user ID not provided");
     return Err(Status::aborted("user not found"));
   }
   let server_registration_finish_result = server_registration
     .ok_or_else(|| Status::aborted("registration failed"))?
     .finish(
       RegistrationUpload::deserialize(registration_upload_bytes).map_err(
         |e| {
           error!("Failed to deserialize registration upload bytes: {}", e);
           Status::aborted("registration failed")
         },
       )?,
     )
     .map_err(|e| {
       error!(
         "Encountered a PAKE protocol error when finishing registration: {}",
         e
       );
       Status::aborted("server error")
     })?;
 
   match client
     .add_user_to_users_table(
       user_id.to_string(),
       server_registration_finish_result,
       username.to_string(),
       signing_public_key.to_string(),
       session_initialization_info,
     )
     .await
   {
     Ok(_) => Ok(()),
     Err(e) => Err(handle_db_error(e)),
   }
 }
 
 fn handle_db_error(db_error: DBError) -> Status {
   match db_error {
     DBError::AwsSdk(DynamoDBError::InternalServerError(_))
     | DBError::AwsSdk(DynamoDBError::ProvisionedThroughputExceededException(
       _,
     ))
     | DBError::AwsSdk(DynamoDBError::RequestLimitExceeded(_)) => {
       Status::unavailable("please retry")
     }
     e => {
       error!("Encountered an unexpected error: {}", e);
       Status::failed_precondition("unexpected error")
     }
   }
 }
 
 struct RegistrationResponseAndPakeState {
   response: RegistrationResponse,
   pake_state: ServerRegistration<Cipher>,
 }
 
 struct LoginResponseAndPakeState {
   response: PakeLoginResponseStruct,
   pake_state: ServerLogin<Cipher>,
 }
diff --git a/services/identity/src/service/login.rs b/services/identity/src/service/login.rs
index 4f290c2f9..298af11b6 100644
--- a/services/identity/src/service/login.rs
+++ b/services/identity/src/service/login.rs
@@ -1,99 +1,99 @@
 use super::*;
 pub struct LoginState {
   user_id: String,
   signing_public_key: String,
   pake_state: ServerLogin<Cipher>,
   session_initialization_info: HashMap<String, String>,
 }
 pub async fn handle_login_request(
   message: Option<Result<LoginRequest, Status>>,
   tx: mpsc::Sender<Result<LoginResponse, Status>>,
   client: &DatabaseClient,
 ) -> Result<Option<LoginState>, Status> {
   match message {
     Some(Ok(LoginRequest {
       data: Some(WalletLoginRequest(req)),
     })) => {
       let wallet_login_result =
         wallet_login_helper(client, req, &mut OsRng).await;
       if let Err(e) = tx.send(wallet_login_result).await {
         error!("Response was dropped: {}", e);
         Err(Status::aborted("failure"))
       } else {
         Ok(None)
       }
     }
     Some(Ok(LoginRequest {
       data:
         Some(PakeLoginRequest(PakeLoginRequestStruct {
           data:
             Some(PakeCredentialRequestAndUserId(
               pake_credential_request_and_user_id,
             )),
         })),
     })) => {
       let response_and_state = pake_login_start(
         client,
         &pake_credential_request_and_user_id.user_id,
         &pake_credential_request_and_user_id.pake_credential_request,
       )
       .await?;
       let login_response = LoginResponse {
         data: Some(PakeLoginResponse(response_and_state.response)),
       };
       if let Err(e) = tx.send(Ok(login_response)).await {
         error!("Response was dropped: {}", e);
         return Err(Status::aborted("failure"));
       }
 
       Ok(Some(LoginState {
         user_id: pake_credential_request_and_user_id.user_id,
         signing_public_key: pake_credential_request_and_user_id
           .signing_public_key,
         pake_state: response_and_state.pake_state,
         session_initialization_info: pake_credential_request_and_user_id
           .session_initialization_info
           .ok_or_else(|| Status::invalid_argument("Invalid message"))?
           .info,
       }))
     }
     Some(_) | None => Err(Status::aborted("failure")),
   }
 }
 
 pub async fn handle_credential_finalization(
   message: Option<Result<LoginRequest, Status>>,
   tx: mpsc::Sender<Result<LoginResponse, Status>>,
-  client: DatabaseClient,
+  client: &DatabaseClient,
   login_state: LoginState,
 ) -> Result<(), Status> {
   match message {
     Some(Ok(LoginRequest {
       data:
         Some(PakeLoginRequest(PakeLoginRequestStruct {
           data: Some(PakeCredentialFinalization(pake_credential_finalization)),
         })),
     })) => {
       let login_finish_result = pake_login_finish(
         &login_state.user_id,
         &login_state.signing_public_key,
-        &client,
+        client,
         login_state.pake_state,
         &pake_credential_finalization,
         &mut OsRng,
         PakeWorkflow::Login,
         &login_state.session_initialization_info,
       )
       .await
       .map(|pake_login_response| LoginResponse {
         data: Some(PakeLoginResponse(pake_login_response)),
       });
       if let Err(e) = tx.send(login_finish_result).await {
         error!("Response was dropped: {}", e);
         return Err(Status::aborted("failure"));
       }
       Ok(())
     }
     Some(_) | None => Err(Status::aborted("failure")),
   }
 }
diff --git a/services/identity/src/service/registration.rs b/services/identity/src/service/registration.rs
index 26f885584..d3f2e90da 100644
--- a/services/identity/src/service/registration.rs
+++ b/services/identity/src/service/registration.rs
@@ -1,153 +1,153 @@
 use super::*;
 pub struct RegistrationState {
   user_id: String,
   username: String,
   signing_public_key: String,
   pub pake_state: Option<ServerRegistration<Cipher>>,
   session_initialization_info: HashMap<String, String>,
 }
 
 pub async fn handle_registration_request(
   message: Option<Result<RegistrationRequest, Status>>,
-  client: DatabaseClient,
+  client: &DatabaseClient,
   tx: mpsc::Sender<Result<RegistrationResponse, Status>>,
 ) -> Result<RegistrationState, Status> {
   match message {
     Some(Ok(RegistrationRequest {
       data:
         Some(PakeRegistrationRequestAndUserId(
           pake_registration_request_and_user_id,
         )),
     })) => {
       let get_item_output = client
         .get_item_from_users_table(
           &pake_registration_request_and_user_id.user_id,
         )
         .await;
       match get_item_output {
         Ok(GetItemOutput { item: Some(_), .. }) => {
           error!("User already exists");
           if let Err(e) = tx
             .send(Err(Status::already_exists("User already exists")))
             .await
           {
             error!("Response was dropped: {}", e);
           }
         }
         Err(e) => return Err(handle_db_error(e)),
         _ => {}
       };
       let response_and_state = pake_registration_start(
         &mut OsRng,
         &pake_registration_request_and_user_id.pake_registration_request,
       )
       .await?;
       if let Err(e) = tx.send(Ok(response_and_state.response)).await {
         error!("Response was dropped: {}", e);
       }
 
       Ok(RegistrationState {
         user_id: pake_registration_request_and_user_id.user_id,
         username: pake_registration_request_and_user_id.username,
         signing_public_key: pake_registration_request_and_user_id
           .signing_public_key,
         pake_state: Some(response_and_state.pake_state),
         session_initialization_info: pake_registration_request_and_user_id
           .session_initialization_info
           .ok_or_else(|| Status::invalid_argument("Invalid message"))?
           .info,
       })
     }
     None | Some(_) => Err(Status::aborted("failure")),
   }
 }
 
 pub async fn handle_registration_upload_and_credential_request(
   message: Option<Result<RegistrationRequest, Status>>,
   tx: mpsc::Sender<Result<RegistrationResponse, Status>>,
   client: &DatabaseClient,
   registration_state: &RegistrationState,
   pake_state: ServerRegistration<Cipher>,
 ) -> Result<ServerLogin<Cipher>, Status> {
   match message {
     Some(Ok(RegistrationRequest {
       data:
         Some(PakeRegistrationUploadAndCredentialRequest(
           pake_registration_upload_and_credential_request,
         )),
     })) => {
       let response_and_state = match pake_registration_finish(
         &registration_state.user_id,
         client,
         &pake_registration_upload_and_credential_request
           .pake_registration_upload,
         Some(pake_state),
         &registration_state.username,
         &registration_state.signing_public_key,
         &registration_state.session_initialization_info,
       )
       .await
       {
         Ok(_) => {
           pake_login_start(
             client,
             &registration_state.user_id,
             &pake_registration_upload_and_credential_request
               .pake_credential_request,
           )
           .await?
         }
 
         Err(e) => {
           return Err(e);
         }
       };
       let registration_response = RegistrationResponse {
         data: Some(PakeRegistrationLoginResponse(response_and_state.response)),
       };
       if let Err(e) = tx.send(Ok(registration_response)).await {
         error!("Response was dropped: {}", e);
         Err(Status::aborted("failure"))
       } else {
         Ok(response_and_state.pake_state)
       }
     }
     None | Some(_) => Err(Status::aborted("failure")),
   }
 }
 
 pub async fn handle_credential_finalization(
   message: Option<Result<RegistrationRequest, Status>>,
   tx: mpsc::Sender<Result<RegistrationResponse, Status>>,
   client: &DatabaseClient,
   registration_state: &RegistrationState,
   server_login: ServerLogin<Cipher>,
 ) -> Result<(), Status> {
   match message {
     Some(Ok(RegistrationRequest {
       data:
         Some(PakeRegistrationCredentialFinalization(pake_credential_finalization)),
     })) => {
       let login_finish_result = pake_login_finish(
         &registration_state.user_id,
         &registration_state.signing_public_key,
         client,
         server_login,
         &pake_credential_finalization,
         &mut OsRng,
         PakeWorkflow::Registration,
         &registration_state.session_initialization_info,
       )
       .await
       .map(|pake_login_response| RegistrationResponse {
         data: Some(PakeRegistrationLoginResponse(pake_login_response)),
       });
       if let Err(e) = tx.send(login_finish_result).await {
         error!("Response was dropped: {}", e);
         return Err(Status::aborted("failure"));
       }
       Ok(())
     }
     Some(_) | None => Err(Status::aborted("failure")),
   }
 }