diff --git a/src/app/components/login/login.component.html b/src/app/components/login/login.component.html
index 7ec95108..d4ea412c 100644
--- a/src/app/components/login/login.component.html
+++ b/src/app/components/login/login.component.html
@@ -27,5 +27,9 @@
                 <button class="loginButton" mat-raised-button color="primary" (click)="login()">Login</button>
             </div>
         </mat-card>
+
+        <div class="errorMessage">
+            <mat-error *ngIf="loginError">Authentication was unsuccessful</mat-error>
+        </div>
     </div>
 </div>
diff --git a/src/app/components/login/login.component.scss b/src/app/components/login/login.component.scss
index d9529403..dc32554b 100644
--- a/src/app/components/login/login.component.scss
+++ b/src/app/components/login/login.component.scss
@@ -12,8 +12,8 @@ mat-form-field {
 }
 
 .mat-icon-login {
-    height: 200px!important;
-    width: 200px!important;
+    height: 100px!important;
+    width: 100px!important;
 }
 
 .loginTitle {
@@ -29,3 +29,9 @@ mat-form-field {
 .loginButton {
     width: 100%;
 }
+
+.errorMessage {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+}
diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts
index ade03b8b..041b0d03 100644
--- a/src/app/components/login/login.component.ts
+++ b/src/app/components/login/login.component.ts
@@ -21,6 +21,7 @@ export class LoginComponent implements OnInit {
     private server: Server;
     public version: string;
     public isLightThemeEnabled: boolean = false;
+    public loginError: boolean = false;
 
     loginForm = new FormGroup({
         username: new FormControl('', [Validators.required]),
@@ -72,6 +73,8 @@ export class LoginComponent implements OnInit {
             await this.serverService.update(server);
 
             this.router.navigate(['/server', this.server.id, 'projects']);
+        }, error => {
+            this.loginError = true;
         });
     }
 }
diff --git a/src/app/layouts/default-layout/default-layout.component.html b/src/app/layouts/default-layout/default-layout.component.html
index 7efbf5e0..1bdb062a 100644
--- a/src/app/layouts/default-layout/default-layout.component.html
+++ b/src/app/layouts/default-layout/default-layout.component.html
@@ -8,13 +8,13 @@
       Projects
     </button>
 
-    <button *ngIf="recentlyOpenedProjectId && recentlyOpenedServerId" mat-button (click)="backToProject()">
+    <button *ngIf="recentlyOpenedProjectId && recentlyOpenedServerId && !isLoginPage" mat-button (click)="backToProject()">
       Back to project
     </button>
 
     <span class="fill-space"></span>
 
-    <button mat-button [matMenuTriggerFor]="menu">
+    <button mat-button *ngIf="!isLoginPage" [matMenuTriggerFor]="menu">
       <mat-icon>more_vert</mat-icon>
     </button>
 
diff --git a/src/app/layouts/default-layout/default-layout.component.ts b/src/app/layouts/default-layout/default-layout.component.ts
index 4c5a9c00..2c174bf9 100644
--- a/src/app/layouts/default-layout/default-layout.component.ts
+++ b/src/app/layouts/default-layout/default-layout.component.ts
@@ -20,6 +20,7 @@ import { Server } from '../../models/server';
 export class DefaultLayoutComponent implements OnInit, OnDestroy {
   public isInstalledSoftwareAvailable = false;
   public uiVersion = version;
+  public isLoginPage = false;
 
   serverStatusSubscription: Subscription;
   shouldStopServersOnClosing = true;
@@ -40,6 +41,10 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
   ) {}
 
   ngOnInit() {
+    if (this.router.url.includes("login")) {
+      this.isLoginPage = true;
+    };
+    
     this.recentlyOpenedServerId = this.recentlyOpenedProjectService.getServerId();
     this.recentlyOpenedProjectId = this.recentlyOpenedProjectService.getProjectId();
     this.serverIdProjectList = this.recentlyOpenedProjectService.getServerIdProjectList();