diff --git a/web/src/app/pages/settings/settings.component.ts b/web/src/app/pages/settings/settings.component.ts
index e47b5069..6dd22648 100644
--- a/web/src/app/pages/settings/settings.component.ts
+++ b/web/src/app/pages/settings/settings.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { WebsocketHandlerService } from './../../services/websocket-handler/websocket-handler.service';
 
 @Component({
   selector: 'app-settings',
diff --git a/web/src/app/services/websocket-handler/websocket-handler.service.ts b/web/src/app/services/websocket-handler/websocket-handler.service.ts
index 9ba8d094..0e91b901 100644
--- a/web/src/app/services/websocket-handler/websocket-handler.service.ts
+++ b/web/src/app/services/websocket-handler/websocket-handler.service.ts
@@ -10,19 +10,30 @@ export interface Message {
 	data:object,
 }
 
+
 @Injectable()
 export class WebsocketHandlerService {
-	public messages: Subject<Message>;
+  public messages: Subject<Message>;
+  
+   private authenticateMessage = {
+    Event:'auth',
+    data:{"username":"Username","password":"e7cf3ef4f17c3999a94f2c6f612e8a888e5b1026878e4e19398b23bd38ec221a"},
+  }
 
 	constructor(wsService: WebsocketService) {
 		this.messages = <Subject<Message>>wsService
 			.connect(WEBSOCKET_URL) 
 			.map((response: MessageEvent): Message => {
-				let data = JSON.parse(response.data);
+        let data = JSON.parse(response.data);
+        console.log('Recieved response from websocket. Event: '+ data.Event)
+        
 				return {
 					Event: data.Event,
 					data: data.data,
 				}
-			});
+      });
+      //Auth straight away!
+      console.log('Sending message to websocket. Event:'+this.authenticateMessage.Event+'. Message: ' + JSON.stringify(this.authenticateMessage.data));
+      this.messages.next(this.authenticateMessage);
 	}
 }
\ No newline at end of file
diff --git a/web/src/app/shared/chatbutton/chatbutton.component.ts b/web/src/app/shared/chatbutton/chatbutton.component.ts
index 213197e3..11298fef 100644
--- a/web/src/app/shared/chatbutton/chatbutton.component.ts
+++ b/web/src/app/shared/chatbutton/chatbutton.component.ts
@@ -9,13 +9,8 @@ import { WebsocketHandlerService } from './../../services/websocket-handler/webs
 export class ChatbuttonComponent implements OnInit {
 
     constructor(private chatService: WebsocketHandlerService) {
-		chatService.messages.subscribe(msg => {
-      if(msg.Event === 'orderbook_update')	 {		
-      console.log("Response from websocket: " + JSON.stringify(msg));
-      } else {
-        console.log("recieved unsubscribed event of type: "  + msg.Event)
-      }
-		});
+      	chatService.messages.subscribe(msg => {
+        });
 	}
 
   ngOnInit() {
@@ -27,7 +22,7 @@ export class ChatbuttonComponent implements OnInit {
   }
   private authenticateMessage = {
     Event:'auth',
-    data:{"username":"username","password":"5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8"},
+    data:{"username":"Username","password":"16f78a7d6317f102bbd95fc9a4f3ff2e3249287690b8bdad6b7810f82b34ace3"},
   }
   
   authenticate():void {