diff --git a/packages/api/src/Domain/Client/User/UserApiService.ts b/packages/api/src/Domain/Client/User/UserApiService.ts
index 757f9bfb8..c73f727fa 100644
--- a/packages/api/src/Domain/Client/User/UserApiService.ts
+++ b/packages/api/src/Domain/Client/User/UserApiService.ts
@@ -58,7 +58,7 @@ export class UserApiService implements UserApiServiceInterface {
 
       return response
     } catch (error) {
-      throw new ApiCallError(ErrorMessage.GenericRegistrationFail)
+      throw new ApiCallError(ErrorMessage.GenericFail)
     }
   }
 
diff --git a/packages/snjs/lib/Application/Dependencies/Dependencies.ts b/packages/snjs/lib/Application/Dependencies/Dependencies.ts
index d310afab6..65ecce4b0 100644
--- a/packages/snjs/lib/Application/Dependencies/Dependencies.ts
+++ b/packages/snjs/lib/Application/Dependencies/Dependencies.ts
@@ -140,6 +140,7 @@ import {
   SubscriptionApiService,
   SubscriptionServer,
   UserApiService,
+  UserRequestServer,
   UserServer,
   WebSocketApiService,
   WebSocketServer,
@@ -1204,7 +1205,7 @@ export class Dependencies {
     })
 
     this.factory.set(TYPES.UserRequestServer, () => {
-      return new UserServer(this.get(TYPES.HttpService))
+      return new UserRequestServer(this.get(TYPES.HttpService))
     })
 
     this.factory.set(TYPES.InternalEventBus, () => {