diff --git a/server/app/index.html b/server/app/index.html
index f6d51842f..fe60da6bc 100644
--- a/server/app/index.html
+++ b/server/app/index.html
@@ -6,7 +6,7 @@
 		<meta name="viewport" content="width=device-width, user-scalable=no">
 		<title></title>
 
-		<link rel="shortcut icon" href="/favicon.ico" />
+		<link rel="shortcut icon" href="/static/favicon.ico" />
 		<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/pure/0.5.0/pure-min.css" />
 		<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/pure/0.5.0/grids-responsive-min.css" />
 		<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" />
diff --git a/server/app/scripts/services/feed.js b/server/app/scripts/services/feed.js
index 07cb1b77e..8d3e085ba 100644
--- a/server/app/scripts/services/feed.js
+++ b/server/app/scripts/services/feed.js
@@ -2,8 +2,9 @@
 
 angular.module('app').service('feed', ['$http', '$window', function($http, $window) {
 
+	var token = localStorage.getItem('access_token');
 	var proto = ($window.location.protocol == 'https:' ? 'wss' : 'ws');
-	var route = [proto, "://", $window.location.host, '/api/stream/user'].join('');
+	var route = [proto, "://", $window.location.host, '/api/stream/user?access_token=', token].join('');
 
 	var wsCallback = undefined;
 	var ws = new WebSocket(route);
diff --git a/server/app/scripts/services/stdout.js b/server/app/scripts/services/stdout.js
index 5fc439d0b..894e26165 100644
--- a/server/app/scripts/services/stdout.js
+++ b/server/app/scripts/services/stdout.js
@@ -3,12 +3,13 @@
 angular.module('app').service('stdout', ['$window', function($window) {
 	var callback = undefined;
 	var websocket = undefined;
+	var token = localStorage.getItem('access_token');
 
 	this.subscribe = function(path, _callback) {
 		callback = _callback;
 
 		var proto = ($window.location.protocol == 'https:' ? 'wss' : 'ws');
-		var route = [proto, "://", $window.location.host, '/api/stream/stdout/', path].join('');
+		var route = [proto, "://", $window.location.host, '/api/stream/stdout/', path, '?access_token=', token].join('');
 
 		websocket = new WebSocket(route);
 		websocket.onmessage = function(event) {
diff --git a/server/app/views/drawer.html b/server/app/views/drawer.html
index a7332e705..72d58fb4d 100644
--- a/server/app/views/drawer.html
+++ b/server/app/views/drawer.html
@@ -5,7 +5,6 @@
 		<li><a href="/account/profile"><i class="fa fa-user"></i> Account</a></li>
 		<li ng-if="user.admin == true"><span class="divider"></span></li>
 		<li ng-if="user.admin == true"><a href="/admin/users"><i class="fa fa-users"></i> Users</a></li>
-		<li ng-if="user.admin == true"><a href="/admin/settings"><i class="fa fa-cog"></i> Settings</a></li>
 	</ul>
 	<a href="/logout" class="signout">Signout <i class="fa fa-sign-out"></i></a>
 </div>
\ No newline at end of file