diff --git a/projects/account/src/app/shared/components/option-btn/option-btn.component.ts b/projects/account/src/app/shared/components/option-btn/option-btn.component.ts
index 596f70e..02a055c 100644
--- a/projects/account/src/app/shared/components/option-btn/option-btn.component.ts
+++ b/projects/account/src/app/shared/components/option-btn/option-btn.component.ts
@@ -36,7 +36,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 export class OptionBtnComponent implements ControlValueAccessor {
     @Input() config: OptionButtonsConfig;
     @Input() disabled = false;
-    @ViewChild(MatButtonToggleGroup) options: MatButtonToggleGroup;
+    @ViewChild(MatButtonToggleGroup, { static: true }) private options: MatButtonToggleGroup;
     public onChange;
     public onTouched;
 
diff --git a/projects/precise/src/app/modules/tagger/pages/tag/tag.component.html b/projects/precise/src/app/modules/tagger/pages/tag/tag.component.html
index 26f59ea..14b8810 100644
--- a/projects/precise/src/app/modules/tagger/pages/tag/tag.component.html
+++ b/projects/precise/src/app/modules/tagger/pages/tag/tag.component.html
@@ -20,10 +20,10 @@
         >
         </ng-waveform>
         <div fxFlexFill fxLayoutGap="8px" fxLayoutAlign="center">
-            <button mat-flat-button (click)="onPlayButtonClick()">
+            <button mat-flat-button (click)="onPlayButtonClick()" [disabled]="playbackButtonsDisabled">
                 <fa-icon [icon]="playIcon"></fa-icon>
             </button>
-            <button mat-flat-button (click)="onPauseButtonClick()">
+            <button mat-flat-button (click)="onPauseButtonClick()" [disabled]="playbackButtonsDisabled">
                 <fa-icon [icon]="pauseIcon"></fa-icon>
             </button>
         </div>
@@ -33,7 +33,7 @@
             mat-flat-button
             color="primary"
             *ngFor="let tagValue of tagEvent.tagValues"
-            [disabled]="buttonsDisabled"
+            [disabled]="tagButtonsDisabled"
             (click)="saveTagResult(tagValue.id)"
         >
             {{tagValue.display}}
diff --git a/projects/precise/src/app/modules/tagger/pages/tag/tag.component.ts b/projects/precise/src/app/modules/tagger/pages/tag/tag.component.ts
index a0ccd41..05565fb 100644
--- a/projects/precise/src/app/modules/tagger/pages/tag/tag.component.ts
+++ b/projects/precise/src/app/modules/tagger/pages/tag/tag.component.ts
@@ -30,7 +30,8 @@ import { animate, state, style, transition, trigger } from '@angular/animations'
 export class TagComponent implements OnInit {
     @ViewChild('waveform', { static: false }) waveform: NgWaveformComponent;
     public audioUrl: string;
-    public buttonsDisabled: boolean;
+    public tagButtonsDisabled: boolean;
+    public playbackButtonsDisabled: boolean;
     public isTagged = false;
     public playIcon = faPlay;
     public pauseIcon = faPause;
@@ -41,11 +42,13 @@ export class TagComponent implements OnInit {
     constructor(private route: ActivatedRoute, private taggerService: TaggerService) { }
 
     ngOnInit(): void {
-        this.buttonsDisabled = true;
+        this.tagButtonsDisabled = true;
+        this.playbackButtonsDisabled = true;
         this.route.data.subscribe(
             (data: {tagEvent: TagEvent}) => {
                 this.tagEvent = data.tagEvent;
                 this.audioUrl = this.preciseUrl + '/api/audio/' + this.tagEvent.audioFileName;
+                this.playbackButtonsDisabled = false;
             }
         );
         this.route.paramMap.subscribe(
@@ -54,7 +57,7 @@ export class TagComponent implements OnInit {
     }
 
     onPlayButtonClick(): void {
-        this.buttonsDisabled = false;
+        this.tagButtonsDisabled = false;
         this.waveform.play();
     }
 
@@ -69,7 +72,9 @@ export class TagComponent implements OnInit {
             tagId: this.tagEvent.tagId,
             tagValueId: tagValueId
         };
-        this.buttonsDisabled = true;
+        this.waveform.pause();
+        this.tagButtonsDisabled = true;
+        this.playbackButtonsDisabled = true;
         this.taggerService.addTagEvent(fileTag).subscribe(
             () => { this.isTagged = true; }
         );
@@ -87,13 +92,14 @@ export class TagComponent implements OnInit {
                 this.isTagged = false;
                 this.tagEvent = tagEvent;
                 this.audioUrl = this.preciseUrl + '/api/audio/' + this.tagEvent.audioFileName;
+                this.playbackButtonsDisabled = false;
             }
         );
     }
 
     skipToNextEvent(): void {
         this.waveform.pause();
-        this.buttonsDisabled = true;
+        this.tagButtonsDisabled = true;
         this.isTagged = true;
     }
 }
diff --git a/projects/sso/src/app/shared/shared.module.ts b/projects/sso/src/app/shared/shared.module.ts
index 30bac2e..1552912 100644
--- a/projects/sso/src/app/shared/shared.module.ts
+++ b/projects/sso/src/app/shared/shared.module.ts
@@ -75,11 +75,11 @@ import { environment } from '../../environments/environment';
         providers: [
           {
             id: GoogleLoginProvider.PROVIDER_ID,
-            provider: new GoogleLoginProvider(environment.facebookClientId),
+            provider: new GoogleLoginProvider(environment.googleClientId),
           },
           {
             id: FacebookLoginProvider.PROVIDER_ID,
-            provider: new FacebookLoginProvider(environment.googleClientId),
+            provider: new FacebookLoginProvider(environment.facebookClientId),
           },
         ],
       } as SocialAuthServiceConfig,