diff --git a/npm/ng-packs/packages/account/src/lib/components/login/login.component.ts b/npm/ng-packs/packages/account/src/lib/components/login/login.component.ts
index dd47095893..29bd682e5b 100644
--- a/npm/ng-packs/packages/account/src/lib/components/login/login.component.ts
+++ b/npm/ng-packs/packages/account/src/lib/components/login/login.component.ts
@@ -49,8 +49,8 @@ export class LoginComponent {
       .pipe(
         switchMap(() => this.store.dispatch(new ConfigGetAppConfiguration())),
         tap(() => {
-          const redirectUrl = (window.history.state || {}).redirectUrl || (this.options || {}).redirectUrl;
-          this.store.dispatch(new Navigate([redirectUrl || '/']));
+          const redirectUrl = snq(() => window.history.state).redirectUrl || (this.options || {}).redirectUrl || '/';
+          this.store.dispatch(new Navigate([redirectUrl]));
         }),
         catchError(err => {
           this.toasterService.error(snq(() => err.error.error_description, 'An error occured.'), 'Error');
diff --git a/npm/ng-packs/packages/core/src/lib/services/profile.service.ts b/npm/ng-packs/packages/core/src/lib/services/profile.service.ts
index c8d6f07d1a..44e1355768 100644
--- a/npm/ng-packs/packages/core/src/lib/services/profile.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/profile.service.ts
@@ -12,7 +12,7 @@ export class ProfileService {
   get(): Observable<Profile.Response> {
     const request: Rest.Request<null> = {
       method: 'GET',
-      url: '/api/identity/profile',
+      url: '/api/identity/my-profile',
     };
 
     return this.rest.request<null, Profile.Response>(request);
@@ -21,7 +21,7 @@ export class ProfileService {
   update(body: Profile.Response): Observable<Profile.Response> {
     const request: Rest.Request<Profile.Response> = {
       method: 'PUT',
-      url: '/api/identity/profile',
+      url: '/api/identity/my-profile',
       body,
     };
 
@@ -31,7 +31,7 @@ export class ProfileService {
   changePassword(body: Profile.ChangePasswordRequest): Observable<null> {
     const request: Rest.Request<Profile.ChangePasswordRequest> = {
       method: 'POST',
-      url: '/api/identity/profile/changePassword',
+      url: '/api/identity/my-profile/changePassword',
       body,
     };
 
diff --git a/npm/ng-packs/packages/identity/src/lib/services/identity.service.ts b/npm/ng-packs/packages/identity/src/lib/services/identity.service.ts
index 99a258b720..58801cd5f5 100644
--- a/npm/ng-packs/packages/identity/src/lib/services/identity.service.ts
+++ b/npm/ng-packs/packages/identity/src/lib/services/identity.service.ts
@@ -12,7 +12,7 @@ export class IdentityService {
   getRoles(): Observable<Identity.RoleResponse> {
     const request: Rest.Request<null> = {
       method: 'GET',
-      url: '/api/identity/role',
+      url: '/api/identity/roles',
     };
 
     return this.rest.request<null, Identity.RoleResponse>(request);
@@ -21,7 +21,7 @@ export class IdentityService {
   getRoleById(id: string): Observable<Identity.RoleItem> {
     const request: Rest.Request<null> = {
       method: 'GET',
-      url: `/api/identity/role/${id}`,
+      url: `/api/identity/roles/${id}`,
     };
 
     return this.rest.request<null, Identity.RoleItem>(request);
@@ -30,7 +30,7 @@ export class IdentityService {
   deleteRole(id: string): Observable<Identity.RoleItem> {
     const request: Rest.Request<null> = {
       method: 'DELETE',
-      url: `/api/identity/role/${id}`,
+      url: `/api/identity/roles/${id}`,
     };
 
     return this.rest.request<null, Identity.RoleItem>(request);
@@ -39,7 +39,7 @@ export class IdentityService {
   addRole(body: Identity.RoleSaveRequest): Observable<Identity.RoleItem> {
     const request: Rest.Request<Identity.RoleSaveRequest> = {
       method: 'POST',
-      url: '/api/identity/role',
+      url: '/api/identity/roles',
       body,
     };
 
@@ -47,7 +47,7 @@ export class IdentityService {
   }
 
   updateRole(body: Identity.RoleItem): Observable<Identity.RoleItem> {
-    const url = `/api/identity/role/${body.id}`;
+    const url = `/api/identity/roles/${body.id}`;
     delete body.id;
 
     const request: Rest.Request<Identity.RoleItem> = {
@@ -62,7 +62,7 @@ export class IdentityService {
   getUsers(params = {} as ABP.PageQueryParams): Observable<Identity.UserResponse> {
     const request: Rest.Request<null> = {
       method: 'GET',
-      url: '/api/identity/user',
+      url: '/api/identity/users',
       params,
     };
 
@@ -72,7 +72,7 @@ export class IdentityService {
   getUserById(id: string): Observable<Identity.UserItem> {
     const request: Rest.Request<null> = {
       method: 'GET',
-      url: `/api/identity/user/${id}`,
+      url: `/api/identity/users/${id}`,
     };
 
     return this.rest.request<null, Identity.UserItem>(request);
@@ -81,7 +81,7 @@ export class IdentityService {
   getUserRoles(id: string): Observable<Identity.RoleResponse> {
     const request: Rest.Request<null> = {
       method: 'GET',
-      url: `/api/identity/user/${id}/roles`,
+      url: `/api/identity/users/${id}/roles`,
     };
 
     return this.rest.request<null, Identity.RoleResponse>(request);
@@ -90,7 +90,7 @@ export class IdentityService {
   deleteUser(id: string): Observable<null> {
     const request: Rest.Request<null> = {
       method: 'DELETE',
-      url: `/api/identity/user/${id}`,
+      url: `/api/identity/users/${id}`,
     };
 
     return this.rest.request<null, null>(request);
@@ -99,7 +99,7 @@ export class IdentityService {
   addUser(body: Identity.UserSaveRequest): Observable<Identity.UserItem> {
     const request: Rest.Request<Identity.UserSaveRequest> = {
       method: 'POST',
-      url: '/api/identity/user',
+      url: '/api/identity/users',
       body,
     };
 
diff --git a/npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management.service.ts b/npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management.service.ts
index e01b635135..9886ebb6fb 100644
--- a/npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management.service.ts
+++ b/npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management.service.ts
@@ -12,7 +12,7 @@ export class TenantManagementService {
   get(): Observable<TenantManagement.Response> {
     const request: Rest.Request<null> = {
       method: 'GET',
-      url: '/api/multi-tenancy/tenant',
+      url: '/api/multi-tenancy/tenants',
     };
 
     return this.rest.request<null, TenantManagement.Response>(request);
@@ -21,7 +21,7 @@ export class TenantManagementService {
   getById(id: string): Observable<ABP.BasicItem> {
     const request: Rest.Request<null> = {
       method: 'GET',
-      url: `/api/multi-tenancy/tenant/${id}`,
+      url: `/api/multi-tenancy/tenants/${id}`,
     };
 
     return this.rest.request<null, ABP.BasicItem>(request);
@@ -30,7 +30,7 @@ export class TenantManagementService {
   delete(id: string): Observable<null> {
     const request: Rest.Request<null> = {
       method: 'DELETE',
-      url: `/api/multi-tenancy/tenant/${id}`,
+      url: `/api/multi-tenancy/tenants/${id}`,
     };
 
     return this.rest.request<null, null>(request);
@@ -39,7 +39,7 @@ export class TenantManagementService {
   add(body: TenantManagement.AddRequest): Observable<ABP.BasicItem> {
     const request: Rest.Request<TenantManagement.AddRequest> = {
       method: 'POST',
-      url: `/api/multi-tenancy/tenant`,
+      url: `/api/multi-tenancy/tenants`,
       body,
     };
 
@@ -47,7 +47,7 @@ export class TenantManagementService {
   }
 
   update(body: TenantManagement.UpdateRequest): Observable<ABP.BasicItem> {
-    const url = `/api/multi-tenancy/tenant/${body.id}`;
+    const url = `/api/multi-tenancy/tenants/${body.id}`;
     delete body.id;
 
     const request: Rest.Request<TenantManagement.UpdateRequest> = {
@@ -60,7 +60,7 @@ export class TenantManagementService {
   }
 
   getDefaultConnectionString(id: string): Observable<string> {
-    const url = `/api/multi-tenancy/tenant/${id}/defaultConnectionString`;
+    const url = `/api/multi-tenancy/tenants/${id}/defaultConnectionString`;
 
     const request: Rest.Request<TenantManagement.DefaultConnectionStringRequest> = {
       method: 'GET',
@@ -71,7 +71,7 @@ export class TenantManagementService {
   }
 
   updateDefaultConnectionString(payload: TenantManagement.DefaultConnectionStringRequest): Observable<any> {
-    const url = `/api/multi-tenancy/tenant/${payload.id}/defaultConnectionString`;
+    const url = `/api/multi-tenancy/tenants/${payload.id}/defaultConnectionString`;
 
     const request: Rest.Request<TenantManagement.DefaultConnectionStringRequest> = {
       method: 'PUT',