diff --git a/package-lock.json b/package-lock.json
index 242f99bc1..ac1175d62 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4251,6 +4251,11 @@
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz",
       "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA=="
     },
+    "bootstrap-slider": {
+      "version": "10.6.2",
+      "resolved": "https://registry.npmjs.org/bootstrap-slider/-/bootstrap-slider-10.6.2.tgz",
+      "integrity": "sha512-8JTPZB9QVOdrGzYF3YgC3YW6ssfPeBvBwZnXffiZ7YH/zz1D0EKlZvmQsm/w3N0XjVNYQEoQ0ax+jHrErV4K1Q=="
+    },
     "boxen": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
@@ -10683,6 +10688,14 @@
       "resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-5.6.2.tgz",
       "integrity": "sha512-6YHXtdXkGH3w0NQoaUgNYAcrj064Lv5RTO284ha/hvpNTrh55yQz2cVh0VvwBk3MjyY2tdmLH4SuCJDszYdYiw=="
     },
+    "ngx-bootstrap-slider": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/ngx-bootstrap-slider/-/ngx-bootstrap-slider-1.8.0.tgz",
+      "integrity": "sha512-wegiLxOyRDEyofi1AEM8503Uq/x9IIYLNlALWp49X0Yh0KEsEN+P94fQtBLIY2v50mstoivMhQmBDitXVzU6/w==",
+      "requires": {
+        "bootstrap-slider": "^10.2.0"
+      }
+    },
     "ngx-build-plus": {
       "version": "9.0.6",
       "resolved": "https://registry.npmjs.org/ngx-build-plus/-/ngx-build-plus-9.0.6.tgz",
diff --git a/package.json b/package.json
index 34ca8949e..5896b3086 100644
--- a/package.json
+++ b/package.json
@@ -82,6 +82,7 @@
     "lodash-es": "4.17.14",
     "moment": "^2.24.0",
     "ngx-bootstrap": "^5.6.2",
+    "ngx-bootstrap-slider": "^1.8.0",
     "ngx-toastr": "^10.2.0",
     "ngx-toggle-switch": "^2.0.5",
     "rxjs": "^6.4.0",
diff --git a/projects/admin/src/app/app.component.spec.ts b/projects/admin/src/app/app.component.spec.ts
index fea505b1f..96fffd51d 100644
--- a/projects/admin/src/app/app.component.spec.ts
+++ b/projects/admin/src/app/app.component.spec.ts
@@ -27,7 +27,6 @@ import { RecordModule } from '@rero/ng-core';
 import { HttpClientModule } from '@angular/common/http';
 import { TranslateModule } from '@ngx-translate/core';
 import { FormsModule } from '@angular/forms';
-import { InterfaceInfoComponent } from './interface-info/interface-info.component';
 
 describe('AppComponent', () => {
   beforeEach(async(() => {
@@ -45,8 +44,7 @@ describe('AppComponent', () => {
       ],
       declarations: [
         AppComponent,
-        MenuComponent,
-        InterfaceInfoComponent
+        MenuComponent
       ]
     }).compileComponents();
   }));
diff --git a/projects/admin/src/app/app.component.ts b/projects/admin/src/app/app.component.ts
index 6d1db6d1f..c2f3d0193 100644
--- a/projects/admin/src/app/app.component.ts
+++ b/projects/admin/src/app/app.component.ts
@@ -142,11 +142,10 @@ export class AppComponent implements OnInit, OnDestroy {
             this.localStorageService.updateDate(User.STORAGE_KEY);
           }
         }
-
-        // Library Switch menu show only on homepage
-        this.librarySwitchService.show(
-          (event.url === '/') ? true : false
-        );
+        // Library Switch menu is enabled only on homepage
+        //   We use this restriction to avoid problems if user is on page using the current library value (my library, some forms, ...)
+        //   To avoid all potential problem, the simplest way is to enable the menu only on the homepage.
+        this.librarySwitchService.enable( event.url === '/');
       })
     );
   }
diff --git a/projects/admin/src/app/app.module.ts b/projects/admin/src/app/app.module.ts
index 2f9ccf6c9..3ea21c960 100644
--- a/projects/admin/src/app/app.module.ts
+++ b/projects/admin/src/app/app.module.ts
@@ -30,7 +30,6 @@ import { ErrorPageComponent } from './error/error-page/error-page.component';
 import { FrontpageBoardComponent } from './frontpage/frontpage-board/frontpage-board.component';
 import { FrontpageComponent } from './frontpage/frontpage.component';
 import { NoCacheHeaderInterceptor } from './interceptor/no-cache-header.interceptor';
-import { InterfaceInfoComponent } from './interface-info/interface-info.component';
 import { MenuComponent } from './menu/menu.component';
 import { BioInformationsPipe } from './pipe/bio-informations.pipe';
 import { BirthDatePipe } from './pipe/birth-date.pipe';
@@ -151,10 +150,8 @@ import { OrderLineComponent } from './record/detail-view/acquisition-order-detai
     ItemTransactionComponent,
     ItemTransactionsComponent,
     PatronDetailViewComponent,
-    InterfaceInfoComponent,
     RefComponent,
     RemoteAutocompleteInputTypeComponent,
-    InterfaceInfoComponent,
     VendorDetailViewComponent,
     VendorBriefViewComponent,
     AddressTypeComponent,
diff --git a/projects/admin/src/app/interface-info/interface-info.component.html b/projects/admin/src/app/interface-info/interface-info.component.html
deleted file mode 100644
index dd842e9ac..000000000
--- a/projects/admin/src/app/interface-info/interface-info.component.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  RERO ILS UI
-  Copyright (C) 2019 RERO
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Affero General Public License as published by
-  the Free Software Foundation, version 3 of the License.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU Affero General Public License for more details.
-
-  You should have received a copy of the GNU Affero General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<div class="container mt-1 mb-1" *ngIf="isSystemLibrarian">
-  <div class="row">
-    <div class="col-sm-12 text-center"><b translate>Current library</b>: {{ libraryName }}</div>
-  </div>
-</div>
diff --git a/projects/admin/src/app/interface-info/interface-info.component.ts b/projects/admin/src/app/interface-info/interface-info.component.ts
deleted file mode 100644
index 8da6c8c25..000000000
--- a/projects/admin/src/app/interface-info/interface-info.component.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * RERO ILS UI
- * Copyright (C) 2019 RERO
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, version 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-import { Component } from '@angular/core';
-import { UserService } from '../service/user.service';
-import { LibrarySwitchService } from '../service/library-switch.service';
-
-@Component({
-  selector: 'admin-interface-info',
-  templateUrl: './interface-info.component.html'
-})
-export class InterfaceInfoComponent {
-
-  /**
-   * Constructor
-   * @param librarySwitchService - LibrarySwitchService
-   * @param userService - UserService
-   */
-  constructor(
-    private librarySwitchService: LibrarySwitchService,
-    private userService: UserService
-  ) { }
-
-  /**
-   * Get Library name
-   * @return null or string
-   */
-  get libraryName() {
-    if (!this.librarySwitchService.currentLibrary) {
-      return;
-    }
-    return this.librarySwitchService.currentLibrary.name;
-  }
-
-  /**
-   * the user is system admin
-   * @return boolean
-   */
-  get isSystemLibrarian() {
-    return this.userService.hasRole('system_librarian');
-  }
-}
diff --git a/projects/admin/src/app/menu/menu.component.html b/projects/admin/src/app/menu/menu.component.html
index 269444173..e4763d480 100644
--- a/projects/admin/src/app/menu/menu.component.html
+++ b/projects/admin/src/app/menu/menu.component.html
@@ -14,7 +14,6 @@
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<admin-interface-info></admin-interface-info>
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark d-flex">
   <div class="container">
     <a [routerLink]="['/']" class="navbar-brand pr-2 text-sm">
@@ -39,12 +38,24 @@
 
     <div class="collapse navbar-collapse" id="navbarSupportedContent" [collapse]="isCollapsed" [isAnimated]="true">
       <ng-core-menu class="mr-auto" [menu]="linksMenu"></ng-core-menu>
-      <ng-core-menu
-        class="userMenu"
-        [menu]="librariesSwitchMenu"
-        (clickItem)="changeLibrary($event)"
-        *ngIf="isVisibleLibrarySwitchMenu && isVisible"
-      ></ng-core-menu>
+
+      <ng-container *ngIf="isVisibleLibrarySwitchMenu && isVisible; else switchLibraryOff">
+        <ng-core-menu
+          class="userMenu"
+          [menu]="librariesSwitchMenu"
+          (clickItem)="changeLibrary($event)"
+        ></ng-core-menu>
+      </ng-container>
+      <ng-template #switchLibraryOff>
+        <ul class="navbar-nav">
+          <li class="nav-item">
+            <div class="nav-link">
+              <i class="fa fa-random"></i> {{ librariesSwitchMenu.entries[0].name }}
+            </div>
+          </li>
+        </ul>
+      </ng-template>
+
       <ng-core-menu [menu]="languagesMenu" (clickItem)="changeLang($event)"></ng-core-menu>
       <ng-core-menu [menu]="userMenu"></ng-core-menu>
     </div>
diff --git a/projects/admin/src/app/menu/menu.component.spec.ts b/projects/admin/src/app/menu/menu.component.spec.ts
index bc3e7336d..d21727499 100644
--- a/projects/admin/src/app/menu/menu.component.spec.ts
+++ b/projects/admin/src/app/menu/menu.component.spec.ts
@@ -33,9 +33,9 @@ describe('MenuComponent', () => {
 
   const libraryTestingSwitchService = jasmine.createSpyObj(
     'LibrarySwitchService', ['generateMenu']);
-  libraryTestingSwitchService.onVisibleMenu$ = of(false);
   libraryTestingSwitchService.entries = [{ entries: [] }];
   libraryTestingSwitchService.onGenerate$ = of([]);
+  libraryTestingSwitchService.currentLibraryRecord$ = of({code: 1});
 
   const userTestingService = jasmine.createSpyObj(
     'UserService', ['getCurrentUser', 'hasRole']
diff --git a/projects/admin/src/app/menu/menu.component.ts b/projects/admin/src/app/menu/menu.component.ts
index 54594b525..acc8d41ba 100644
--- a/projects/admin/src/app/menu/menu.component.ts
+++ b/projects/admin/src/app/menu/menu.component.ts
@@ -45,9 +45,10 @@ export class MenuComponent implements OnInit {
   autocompleteQueryParams: any = { page: '1', size: '10' };
 
   librariesSwitchMenu = {
-    navCssClass: 'navbar-nav',
+    navCssClass: 'navbar-nav rero-ils-nav-select-box',
+    dropdownMenuCssClass: 'dropdown-menu-right',
     entries: [{
-      name: this._translateService.instant('Switch library'),
+      name: '',  // start with empty value, it will be changed when menu is generated
       iconCssClass: 'fa fa-random',
       entries: []
     }]
@@ -58,7 +59,6 @@ export class MenuComponent implements OnInit {
   userMenu = {
     navCssClass: 'navbar-nav',
     dropdownMenuCssClass: 'dropdown-menu-right',
-    iconCssClass: 'fa fa-user',
     entries: []
   };
 
@@ -86,6 +86,7 @@ export class MenuComponent implements OnInit {
 
     this.userMenu.entries.push({
       name: `${currentUser.first_name[0]}${currentUser.last_name[0]}`,
+      iconCssClass: 'fa fa-user',
       entries: [
         {
           name: this._translateService.instant('Public interface'),
@@ -117,19 +118,10 @@ export class MenuComponent implements OnInit {
         this.userMenu.entries[0].entries[0].href = `/${organisation.metadata.code}/`;
       });
 
-    this._librarySwitchService.onVisibleMenu$.subscribe((visible) => {
-      if (
-        visible
-        && this._userService.hasRole('system_librarian')
-        && this._librarySwitchService.entries.length === 0) {
-        this._librarySwitchService.generateMenu();
-      }
-    });
-
-    this._librarySwitchService.onGenerate$.subscribe((entries: any) => {
-      this.librariesSwitchMenu.entries[0].entries = entries;
-    });
-
+    // SWITCH LIBRARY MENU ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    this._librarySwitchService.generateMenu();
+    this._librarySwitchService.onGenerate$.subscribe((entries: any) => this.librariesSwitchMenu.entries[0].entries = entries);
+    this._librarySwitchService.currentLibraryRecord$.subscribe((library: any) => this.librariesSwitchMenu.entries[0].name = library.code);
   }
 
   /**
diff --git a/projects/admin/src/app/scss/styles.scss b/projects/admin/src/app/scss/styles.scss
index 23d436ad7..859fdcba7 100644
--- a/projects/admin/src/app/scss/styles.scss
+++ b/projects/admin/src/app/scss/styles.scss
@@ -63,6 +63,16 @@ header {
   overflow: auto;
 }
 
+.rero-ils-nav-select-box {
+  border: 1px solid $secondary;
+  border-radius: 0.3em;
+  background-color: #FFF;
+
+  .nav-link {
+    padding: 0.25em;
+  }
+}
+
 .list-group-item:last-child {     //TODO: understand why it's needed, it shouldn't
   border-bottom: 0;
 }
diff --git a/projects/admin/src/app/service/library-switch.service.spec.ts b/projects/admin/src/app/service/library-switch.service.spec.ts
index c53f8815e..b727e74f2 100644
--- a/projects/admin/src/app/service/library-switch.service.spec.ts
+++ b/projects/admin/src/app/service/library-switch.service.spec.ts
@@ -14,15 +14,16 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+import { HttpClientModule } from '@angular/common/http';
 import { TestBed } from '@angular/core/testing';
-
+import { TranslateModule } from '@ngx-translate/core';
 import { LibrarySwitchService } from './library-switch.service';
-import { HttpClientModule } from '@angular/common/http';
 
 describe('LibrarySwitchService', () => {
   beforeEach(() => TestBed.configureTestingModule({
     imports: [
-      HttpClientModule
+      HttpClientModule,
+      TranslateModule.forRoot()
     ]
   }));
 
diff --git a/projects/admin/src/app/service/library-switch.service.ts b/projects/admin/src/app/service/library-switch.service.ts
index c874f1a5e..d15610578 100644
--- a/projects/admin/src/app/service/library-switch.service.ts
+++ b/projects/admin/src/app/service/library-switch.service.ts
@@ -15,6 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import { Injectable } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
 import { RecordService, RecordEvent, LocalStorageService } from '@rero/ng-core';
 import { UserService } from './user.service';
 import { map } from 'rxjs/operators';
@@ -33,9 +34,9 @@ export class LibrarySwitchService {
   private onGenerateMenu: Subject<Array<any>> = new Subject();
 
   /**
-   * On Visible Menu
+   * On current library changed event
    */
-  private onVisibleMenu: Subject<boolean> = new Subject();
+  private currentLibrarySubject: Subject<any> = new Subject<any>();
 
   /**
    * Entries for library switch menu
@@ -48,22 +49,22 @@ export class LibrarySwitchService {
   private currentLibraryRecord: any;
 
   /**
-   * Visibility of the menu
+   * define if the menu is enabled
    */
-  private menuVisible = false;
+  private menuEnabled = false;
 
   /**
-   * Return on generate menu observable
+   * Return current library observable
    */
-  get onGenerate$() {
-    return this.onGenerateMenu.asObservable();
+  get currentLibraryRecord$() {
+    return this.currentLibrarySubject.asObservable();
   }
 
   /**
-   * Return on visible menu observable
+   * Return on generate menu observable
    */
-  get onVisibleMenu$() {
-    return this.onVisibleMenu.asObservable();
+  get onGenerate$() {
+    return this.onGenerateMenu.asObservable();
   }
 
   /**
@@ -88,119 +89,143 @@ export class LibrarySwitchService {
   }
 
   /**
-   * Return the visibility of menu
+   * Return the visibility of menu.
+   *   The "switch library" menu should only be visible for system_librarian
+   *   and if the organisation of the current logged user has, at least, two
+   *   related libraries.
+   *   To avoid conflicts, the witch library menu must be enabled only on homepage, the
+   *   `menuEnabled` attribute is set to True is user navigate on homepage, False otherwise
+   * @return True if menu could be visible, false otherwise
    */
-  get visible() {
-    if (!this.userService.hasRole('system_librarian')) {
-      return false;
-    }
-    return this.menuVisible;
+  get visible(): boolean {
+    return this._userService.hasRole('system_librarian') && this.menuEnabled;
   }
 
   /**
    * Constructor
-   * @param recordService - RecordService
-   * @param userService - UserService
-   * @param localStorageService - LocalStorageService
+   * @param _recordService - RecordService
+   * @param _userService - UserService
+   * @param _localStorageService - LocalStorageService
+   * @param _libraryService - LibraryService
+   * @param _translateService: TranslateService
    */
   constructor(
-    private recordService: RecordService,
-    private userService: UserService,
-    private localStorageService: LocalStorageService,
-    private libraryService: LibraryService
+    private _recordService: RecordService,
+    private _userService: UserService,
+    private _localStorageService: LocalStorageService,
+    private _libraryService: LibraryService,
+    private _translateService: TranslateService
   ) {
     this.initObservables();
   }
 
   /**
-   * Visibility of the menu
-   * @return void
+   * enable/disable the menu
    */
-  show(visible: boolean) {
-    this.menuVisible = visible;
-    this.onVisibleMenu.next(visible);
+  enable(isEnabled: boolean) {
+    this.menuEnabled = isEnabled;
   }
 
   /**
    * Generate entries menu
-   * @return void
-   */
-  generateMenu() {
-    if (this.visible) {
-      this.libraryService.allOrderBy$('name').pipe(
-        map(results => results.hits.hits.filter((data: any) =>
-          data.metadata.pid !== this.userService.getCurrentUser().getCurrentLibrary()
-        ))
-      ).subscribe(libraries => {
-        this.menuEntries = [];
-        libraries.map((library: any) => this.menuEntries.push({
+   *   Get all libraries of the current logged user. Each library will be
+   *   an entry of the switch library menu. The current used library should
+   *   be disabled in this menu.
+   *   Finally, When the menu is generated emit the 'generateMenu' event
+   */
+  generateMenu(): void {
+    this._libraryService.allOrderBy$('name').pipe(
+      map(results => (results.hits.total > 0) ? results.hits.hits : [])
+    ).subscribe(libraries => {
+      this.menuEntries = [];
+      libraries.forEach((library: any) => {
+        const data: any = {
           name: library.metadata.name,
-          id: library.metadata.pid
-        }));
-        this.onGenerateMenu.next(this.menuEntries);
+          id: library.metadata.pid,
+          prefix: `[${library.metadata.code}]`
+        };
+        if (this.currentLibraryRecord.pid === library.metadata.pid) {
+          data.suffix = '(' + this._translateService.instant('active') + ')';
+        }
+        this.menuEntries.push(data);
       });
-    }
+      this.onGenerateMenu.next(this.menuEntries);
+    });
   }
 
   /**
    * Load current library record
    * @param libraryPid - string
    */
-  loadCurrentLibrary(libraryPid: string) {
-    this.libraryService.get$(libraryPid).subscribe((library: any) => {
+  private _loadCurrentLibrary(libraryPid: string) {
+    this._libraryService.get$(libraryPid).subscribe((library: any) => {
       this.currentLibraryRecord = library.metadata;
+      this.currentLibrarySubject.next(this.currentLibraryRecord);
     });
   }
 
   /**
    * Switch library
-   * @param libraryPid - string
+   * @param libraryPid: the library pid that user would used
    */
-  switch(libraryPid: string) {
+  switch(libraryPid: string): void {
     const key = User.STORAGE_KEY;
-    const data = this.localStorageService.get(key);
+    const data = this._localStorageService.get(key);
     data.currentLibrary = libraryPid;
-    this.localStorageService.set(key, data);
-    this.loadCurrentLibrary(libraryPid);
-    this.generateMenu();
+    this._localStorageService.set(key, data);
+    // NOTE : As we are listening changed on localStorage, we don't need to modify
+    //        menu to set the newly choose library as active, it will be done by
+    //        the `generateMenu` called by this event handler.
+    this._loadCurrentLibrary(libraryPid);
   }
 
   /**
    * Initialize Observables
-   * @return void
+   *   When any CRUD event is detected on a library the library switch menu should be refreshed
+   *   When local storage 'user' changed, maybe we need to switch to an other current library
    */
-  private initObservables() {
-    this.recordService.onCreate$.subscribe((event: RecordEvent) => {
+  private initObservables(): void {
+    // when a library resource is created
+    //   --> if a new library is created, then regenerate the menuEntries
+    this._recordService.onCreate$.subscribe((event: RecordEvent) => {
       if (event.resource === 'libraries') {
         this.generateMenu();
       }
     });
-    this.recordService.onUpdate$.subscribe((event: RecordEvent) => {
+    // when a library resource is updated
+    //   --> if the library updated is the library currently used, reload the currentLibrary to have refreshed data
+    //   --> regenerate the menuEntries
+    this._recordService.onUpdate$.subscribe((event: RecordEvent) => {
       if (event.resource === 'libraries') {
         const libraryPid = event.data.record.pid;
-        if (this.userService.getCurrentUser().getCurrentLibrary() === libraryPid) {
-          this.loadCurrentLibrary(libraryPid);
+        if (this._userService.getCurrentUser().getCurrentLibrary() === libraryPid) {
+          this._loadCurrentLibrary(libraryPid);
         }
         this.generateMenu();
       }
     });
-    this.recordService.onDelete$.subscribe((event: RecordEvent) => {
+    // when a library resource is delete
+    //   --> if the deleted library is the same than current library, then switch to the library defined into user account
+    //   --> regenerate the menuEntries
+    this._recordService.onDelete$.subscribe((event: RecordEvent) => {
       if (event.resource === 'libraries') {
         const libraryPid = event.data.pid;
-        if (this.userService.getCurrentUser().getCurrentLibrary() === libraryPid) {
-          const userLibrary = this.userService.getCurrentUser().library;
+        if (this._userService.getCurrentUser().getCurrentLibrary() === libraryPid) {
+          const userLibrary = this._userService.getCurrentUser().library;
           this.switch(userLibrary.pid);
         }
         this.generateMenu();
       }
     });
-    this.localStorageService.onSet$.subscribe((event: any) => {
+    // when the local storage USER changed
+    //   --> if local stored 'currentLibrary' <> current library then switch the library and regenerate the menuEntries
+    this._localStorageService.onSet$.subscribe((event: any) => {
       if (event.key === User.STORAGE_KEY) {
         const local = event.data.data;
-        const user = this.userService.getCurrentUser();
+        const user = this._userService.getCurrentUser();
         if (user.getCurrentLibrary() !== local.currentLibrary) {
           user.setCurrentLibrary(local.currentLibrary);
-          this.loadCurrentLibrary(local.currentLibrary);
+          this._loadCurrentLibrary(local.currentLibrary);
           this.generateMenu();
         }
       }
diff --git a/projects/admin/src/app/service/library.service.ts b/projects/admin/src/app/service/library.service.ts
index 69d5aa517..ee38453f3 100644
--- a/projects/admin/src/app/service/library.service.ts
+++ b/projects/admin/src/app/service/library.service.ts
@@ -16,6 +16,7 @@
  */
 import { Injectable } from '@angular/core';
 import { RecordService } from '@rero/ng-core';
+import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 @Injectable({
@@ -41,7 +42,7 @@ export class LibraryService {
   }
 
   get$(pid: string) {
-    return this.recordService.getRecord('libraries', pid);
+    return this.recordService.getRecord(LibraryService.resource, pid);
   }
 
   allOrderBy$(order: string = 'name') {