diff --git a/frontend/app/faces/face/face.component.html b/frontend/app/faces/face/face.component.html
index c28d0d9..f08b362 100644
--- a/frontend/app/faces/face/face.component.html
+++ b/frontend/app/faces/face/face.component.html
@@ -1,4 +1,4 @@
-<a class="button btn btn-default"
+<a class="button btn btn-secondary"
    [routerLink]="['/search', person.name, {type: SearchTypes[SearchTypes.person]}]"
    style="display: inline-block;">
 
diff --git a/frontend/app/gallery/directory/directory.gallery.component.html b/frontend/app/gallery/directory/directory.gallery.component.html
index d3d8fff..3b7c59a 100644
--- a/frontend/app/gallery/directory/directory.gallery.component.html
+++ b/frontend/app/gallery/directory/directory.gallery.component.html
@@ -1,4 +1,4 @@
-<a #dirContainer class="button btn btn-default"
+<a #dirContainer class="button btn btn-secondary"
    [routerLink]="['/gallery', getDirectoryPath()]"
    [queryParams]="queryService.getParams()"
    style="display: inline-block;">
diff --git a/frontend/app/gallery/navigator/navigator.gallery.component.html b/frontend/app/gallery/navigator/navigator.gallery.component.html
index c2056bc..d66f024 100644
--- a/frontend/app/gallery/navigator/navigator.gallery.component.html
+++ b/frontend/app/gallery/navigator/navigator.gallery.component.html
@@ -29,7 +29,7 @@
     <div class="divider" *ngIf="ItemCount > 0 && config.Client.Other.NavBar.showItemCount">&nbsp;</div>
     <div class="btn-group" dropdown placement="bottom right">
       <button id="button-alignment" dropdownToggle type="button"
-              class="btn btn-default dropdown-toggle"
+              class="btn btn-secondary dropdown-toggle"
               [ngClass]="{'btn-secondary':galleryService.sorting.value !== DefaultSorting}"
               aria-controls="dropdown-alignment"
               [innerHTML]="galleryService.sorting.value| iconizeSorting">
diff --git a/frontend/app/gallery/share/share.gallery.component.html b/frontend/app/gallery/share/share.gallery.component.html
index f0b4df5..d77b6db 100644
--- a/frontend/app/gallery/share/share.gallery.component.html
+++ b/frontend/app/gallery/share/share.gallery.component.html
@@ -1,4 +1,4 @@
-<button id="shareButton" class="nav-link btn btn-default btn-link"
+<button id="shareButton" class="nav-link btn  btn-link"
         type="button" [disabled]="!enabled" (click)="openModal(shareModal)">
   <span class="oi oi-share"></span>
   <ng-container i18n>Share</ng-container>
diff --git a/frontend/app/language/language.component.html b/frontend/app/language/language.component.html
index e5af96e..5a9eb63 100644
--- a/frontend/app/language/language.component.html
+++ b/frontend/app/language/language.component.html
@@ -1,6 +1,6 @@
 <div class="dropdown" dropdown>
   <button dropdownToggle
-          class="btn btn-default dropdown-toggle"
+          class="btn btn-secondary dropdown-toggle"
           type="button"
           id="language"
           data-toggle="dropdown"
diff --git a/frontend/app/settings/basic/basic.settings.component.html b/frontend/app/settings/basic/basic.settings.component.html
index 344990b..ea58d16 100644
--- a/frontend/app/settings/basic/basic.settings.component.html
+++ b/frontend/app/settings/basic/basic.settings.component.html
@@ -90,7 +90,7 @@
               [disabled]="!settingsForm.form.valid || !changed || inProgress"
               (click)="save()" i18n>Save
       </button>
-      <button class="btn btn-default float-right"
+      <button class="btn btn-secondary float-right"
               (click)="reset()" i18n>Reset
       </button>
     </div>
diff --git a/frontend/app/settings/database/database.settings.component.html b/frontend/app/settings/database/database.settings.component.html
index 574d6a6..8aa7816 100644
--- a/frontend/app/settings/database/database.settings.component.html
+++ b/frontend/app/settings/database/database.settings.component.html
@@ -36,7 +36,7 @@
             [disabled]="!settingsForm.form.valid || !changed || inProgress"
             (click)="save()" i18n>Save
     </button>
-    <button class="btn btn-default float-right"
+    <button class="btn btn-secondary float-right"
             (click)="reset()" i18n>Reset
     </button>
   </div>
diff --git a/frontend/app/settings/indexing/indexing.settings.component.html b/frontend/app/settings/indexing/indexing.settings.component.html
index a9f727f..2adbb21 100644
--- a/frontend/app/settings/indexing/indexing.settings.component.html
+++ b/frontend/app/settings/indexing/indexing.settings.component.html
@@ -54,7 +54,7 @@
                 [disabled]="!settingsForm.form.valid || !changed || inProgress"
                 (click)="save()" i18n>Save
         </button>
-        <button class="btn btn-default float-right"
+        <button class="btn btn-secondary float-right"
                 (click)="reset()" i18n>Reset
         </button>
         <br/>
@@ -102,7 +102,7 @@
                 [disabled]="inProgress"
                 (click)="index(true)" i18n>Index with Thumbnails
         </button>
-        <button class="btn btn-default"
+        <button class="btn btn-secondary"
                 *ngIf="_settingsService.progress.value != null"
                 [disabled]="inProgress"
                 (click)="cancelIndexing()" i18n>Cancel
diff --git a/frontend/app/settings/map/map.settings.component.html b/frontend/app/settings/map/map.settings.component.html
index 0a10963..59f3621 100644
--- a/frontend/app/settings/map/map.settings.component.html
+++ b/frontend/app/settings/map/map.settings.component.html
@@ -62,7 +62,7 @@
               [disabled]="!settingsForm.form.valid || !changed || inProgress"
               (click)="save()" i18n>Save
       </button>
-      <button class="btn btn-default float-right"
+      <button class="btn btn-secondary float-right"
               (click)="reset()" i18n>Reset
       </button>
     </div>
diff --git a/frontend/app/settings/metafiles/metafile.settings.component.html b/frontend/app/settings/metafiles/metafile.settings.component.html
index 9ae70f7..ebc86e1 100644
--- a/frontend/app/settings/metafiles/metafile.settings.component.html
+++ b/frontend/app/settings/metafiles/metafile.settings.component.html
@@ -27,7 +27,7 @@
               [disabled]="!settingsForm.form.valid || !changed || inProgress"
               (click)="save()" i18n>Save
       </button>
-      <button class="btn btn-default float-right"
+      <button class="btn btn-secondary float-right"
               (click)="reset()" i18n>Reset
       </button>
     </div>
diff --git a/frontend/app/settings/other/other.settings.component.html b/frontend/app/settings/other/other.settings.component.html
index 8ec99d6..66deee8 100644
--- a/frontend/app/settings/other/other.settings.component.html
+++ b/frontend/app/settings/other/other.settings.component.html
@@ -167,7 +167,7 @@
               [disabled]="!settingsForm.form.valid || !changed || inProgress"
               (click)="save()" i18n>Save
       </button>
-      <button class="btn btn-default float-right"
+      <button class="btn btn-secondary float-right"
               (click)="reset()" i18n>Reset
       </button>
     </div>
diff --git a/frontend/app/settings/random-photo/random-photo.settings.component.html b/frontend/app/settings/random-photo/random-photo.settings.component.html
index 8075e7a..ad70e54 100644
--- a/frontend/app/settings/random-photo/random-photo.settings.component.html
+++ b/frontend/app/settings/random-photo/random-photo.settings.component.html
@@ -36,7 +36,7 @@
               [disabled]="!settingsForm.form.valid || !changed || inProgress"
               (click)="save()" i18n>Save
       </button>
-      <button class="btn btn-default float-right"
+      <button class="btn btn-secondary float-right"
               (click)="reset()" i18n>Reset
       </button>
     </div>
diff --git a/frontend/app/settings/search/search.settings.component.html b/frontend/app/settings/search/search.settings.component.html
index ed3f6d7..2aaaea8 100644
--- a/frontend/app/settings/search/search.settings.component.html
+++ b/frontend/app/settings/search/search.settings.component.html
@@ -72,7 +72,7 @@
               [disabled]="!settingsForm.form.valid || !changed || inProgress"
               (click)="save()" i18n>Save
       </button>
-      <button class="btn btn-default float-right"
+      <button class="btn btn-secondary float-right"
               (click)="reset()" i18n>Reset
       </button>
     </div>
diff --git a/frontend/app/settings/share/share.settings.component.html b/frontend/app/settings/share/share.settings.component.html
index 85e81bf..e48006d 100644
--- a/frontend/app/settings/share/share.settings.component.html
+++ b/frontend/app/settings/share/share.settings.component.html
@@ -51,7 +51,7 @@
               [disabled]="!settingsForm.form.valid || !changed || inProgress"
               (click)="save()" i18n>Save
       </button>
-      <button class="btn btn-default float-right"
+      <button class="btn btn-secondary float-right"
               (click)="reset()" i18n>Reset
       </button>
     </div>
diff --git a/frontend/app/settings/thumbnail/thumbanil.settings.component.html b/frontend/app/settings/thumbnail/thumbanil.settings.component.html
index f6423c0..abc5be7 100644
--- a/frontend/app/settings/thumbnail/thumbanil.settings.component.html
+++ b/frontend/app/settings/thumbnail/thumbanil.settings.component.html
@@ -103,7 +103,7 @@
               [disabled]="!settingsForm.form.valid || !changed || inProgress"
               (click)="save()" i18n>Save
       </button>
-      <button class="btn btn-default float-right"
+      <button class="btn btn-secondary float-right"
               (click)="reset()" i18n>Reset
       </button>
     </div>
diff --git a/frontend/app/settings/usermanager/usermanager.settings.component.html b/frontend/app/settings/usermanager/usermanager.settings.component.html
index 8e28717..def9ac8 100644
--- a/frontend/app/settings/usermanager/usermanager.settings.component.html
+++ b/frontend/app/settings/usermanager/usermanager.settings.component.html
@@ -43,7 +43,7 @@
           </td>
           <td>
             <button [disabled]="!canModifyUser(user)" (click)="deleteUser(user)"
-                    [ngClass]="canModifyUser(user)? 'btn-danger':'btn-default'"
+                    [ngClass]="canModifyUser(user)? 'btn-danger':'btn-secondary'"
                     class="btn float-right">
               <span class="oi oi-trash" aria-hidden="true" aria-label="Delete"></span>
             </button>
@@ -84,7 +84,7 @@
           </select>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-default" (click)="userModal.hide()" i18n>Close</button>
+          <button type="button" class="btn btn-secondary" (click)="userModal.hide()" i18n>Close</button>
           <button type="button" class="btn btn-primary" data-dismiss="modal"
                   (click)="addNewUser()"
                   [disabled]="!NewUserForm.form.valid" i18n>Add User
diff --git a/frontend/app/settings/usermanager/usermanager.settings.component.ts b/frontend/app/settings/usermanager/usermanager.settings.component.ts
index 9d94ea8..a4ce0d2 100644
--- a/frontend/app/settings/usermanager/usermanager.settings.component.ts
+++ b/frontend/app/settings/usermanager/usermanager.settings.component.ts
@@ -71,11 +71,6 @@ export class UserMangerSettingsComponent implements OnInit {
     return currentUser.name !== user.name && currentUser.role >= user.role;
   }
 
-  private async getSettings() {
-    this.enabled = await this._userSettings.getSettings();
-  }
-
-
   async switched(event: { previousValue: false, currentValue: true }) {
     this.inProgress = true;
     this.error = '';
@@ -105,9 +100,14 @@ export class UserMangerSettingsComponent implements OnInit {
   }
 
   async addNewUser() {
-    await this._userSettings.createUser(this.newUser);
-    await this.getUsersList();
-    this.childModal.hide();
+    try {
+      await this._userSettings.createUser(this.newUser);
+      await this.getUsersList();
+      this.childModal.hide();
+    } catch (e) {
+      const err: ErrorDTO = e;
+      this.notification.error(err.message + ', ' + err.details, 'User creation error!');
+    }
   }
 
   async updateRole(user: UserDTO) {
@@ -122,6 +122,10 @@ export class UserMangerSettingsComponent implements OnInit {
     this.childModal.hide();
   }
 
+  private async getSettings() {
+    this.enabled = await this._userSettings.getSettings();
+  }
+
   private async getUsersList() {
     try {
       this.users = await this._userSettings.getUsers();
diff --git a/frontend/app/settings/video/video.settings.component.html b/frontend/app/settings/video/video.settings.component.html
index 9c13b4d..2a26f42 100644
--- a/frontend/app/settings/video/video.settings.component.html
+++ b/frontend/app/settings/video/video.settings.component.html
@@ -27,7 +27,7 @@
               [disabled]="!settingsForm.form.valid || !changed || inProgress"
               (click)="save()" i18n>Save
       </button>
-      <button class="btn btn-default float-right"
+      <button class="btn btn-secondary float-right"
               (click)="reset()" i18n>Reset
       </button>
     </div>