diff --git a/login/user.component.ts b/login/user.component.ts
index e1b353a0..acf2b748 100644
--- a/login/user.component.ts
+++ b/login/user.component.ts
@@ -52,7 +52,7 @@ export class UserComponent {
           this.errorCode = params["errorCode"];
           this.redirectUrl = params["redirectUrl"];
           this.errorMessage = "";
-          if (this.loggedIn && this.errorCode == '1') {
+          if (this.loggedIn && (this.errorCode == '1' || this.errorCode == '3')) {
             this.redirect();
           } else {
             this.loading = false;
diff --git a/utils/modal/full-screen-modal/full-screen-modal.component.ts b/utils/modal/full-screen-modal/full-screen-modal.component.ts
index 26717cd6..99185b1f 100644
--- a/utils/modal/full-screen-modal/full-screen-modal.component.ts
+++ b/utils/modal/full-screen-modal/full-screen-modal.component.ts
@@ -7,19 +7,24 @@ import {delay} from "rxjs/operators";
   template: `
     <div class="fs-modal" (click)="close()">
       <div id="fs-modal" (click)="$event.stopPropagation()" class="fs-modal-dialog">
-        <a class="close" (click)="close()">
+        <!--<a class="close" (click)="close()">
           <icon name="close"></icon>
-        </a>
+        </a>-->
         <div class="header">
-          <h6 *ngIf="title">{{title}}</h6>
+          <div class="uk-flex-middle uk-grid" uk-grid>
+            <h4 *ngIf="title" class="uk-margin-remove uk-width-expand uk-text-truncate">{{title}}</h4>
+            <div *ngIf="cancelButton || okButton" class="uk-flex uk-flex-right">
+              <div>
+                <ng-content select="[actions]"></ng-content>
+              </div>
+              <button *ngIf="cancelButton" class="uk-button uk-button-secondary outlined uk-margin-small-left" [disabled]="cancelButtonDisabled" (click)="close()">{{cancelButtonText}}</button>
+              <button *ngIf="okButton" class="uk-button uk-button-secondary uk-margin-small-left" [disabled]="okButtonDisabled" (click)="ok()">{{okButtonText}}</button>
+            </div>
+          </div>
         </div>
-        <div class="content" [class.hasFooter]="cancelButton || okButton">
+        <div class="content">
           <ng-content></ng-content>
         </div>
-        <div *ngIf="cancelButton || okButton" class="footer uk-flex uk-flex-right">
-          <button *ngIf="cancelButton" class="uk-button uk-button-secondary outlined" [disabled]="cancelButtonDisabled" (click)="close()">{{cancelButtonText}}</button>
-          <button *ngIf="okButton" class="uk-button uk-button-secondary uk-margin-small-left" [disabled]="okButtonDisabled" (click)="ok()">{{okButtonText}}</button>
-        </div>
       </div>
     </div>
   `