diff --git a/src/ember/channel.js b/src/ember/channel.js
index 50be7a13..f935b30e 100644
--- a/src/ember/channel.js
+++ b/src/ember/channel.js
@@ -1086,17 +1086,17 @@ FFZ.settings_info.chatter_count = {
 	help: "Display the current number of users connected to chat beneath the channel.",
 
 	on_update: function(val) {
-			if ( this._cindex )
-				this._cindex.ffzUpdateChatters();
+		if ( this._cindex )
+			this._cindex.ffzUpdateMetadata('chatters');
 
-			if ( ! val || ! this.rooms )
-				return;
+		if ( ! val || ! this.rooms )
+			return;
 
-			// Refresh the data.
-			for(var room_id in this.rooms)
-				this.rooms.hasOwnProperty(room_id) && this.rooms[room_id].room && this.rooms[room_id].room.ffzInitChatterCount();
-		}
-	};
+		// Refresh the data.
+		for(var room_id in this.rooms)
+			this.rooms.hasOwnProperty(room_id) && this.rooms[room_id].room && this.rooms[room_id].room.ffzInitChatterCount();
+	}
+};
 
 
 FFZ.settings_info.channel_views = {
@@ -1147,10 +1147,10 @@ FFZ.settings_info.stream_host_button = {
 	name: "Host This Channel Button",
 	help: "Display a button underneath streams that make it easy to host them with your own channel.",
 	on_update: function(val) {
-			if ( this._cindex )
-				this._cindex.ffzUpdateHostButton();
-		}
-	};
+		if ( this._cindex )
+			this._cindex.ffzUpdateHostButton();
+	}
+};
 
 
 FFZ.settings_info.stream_uptime = {
@@ -1171,10 +1171,10 @@ FFZ.settings_info.stream_uptime = {
 	name: "Stream Uptime",
 	help: 'Display the stream uptime under a channel by the viewer count.',
 	on_update: function(val) {
-			if ( this._cindex )
-				this._cindex.ffzUpdateUptime();
-		}
-	};
+		if ( this._cindex )
+			this._cindex.ffzUpdateMetadata('uptime');
+	}
+};
 
 
 FFZ.settings_info.stream_title = {
@@ -1187,10 +1187,10 @@ FFZ.settings_info.stream_title = {
 	name: "Title Links",
 	help: "Make links in stream titles clickable.",
 	on_update: function(val) {
-			if ( this._cindex )
-				this._cindex.ffzFixTitle();
-		}
-	};
+		if ( this._cindex )
+			this._cindex.ffzFixTitle();
+	}
+};
 
 
 FFZ.settings_info.channel_bar_bottom = {
diff --git a/src/ui/channel_stats.js b/src/ui/channel_stats.js
index 2741d031..5aa9228e 100644
--- a/src/ui/channel_stats.js
+++ b/src/ui/channel_stats.js
@@ -122,7 +122,7 @@ metadata.host = {
 
 	order: 98,
 	label: function(user, channel_id, hosting_id) {
-		if ( ! user || user.login === channel_id )
+		if ( ! this.settings.stream_host_button || ! user || user.login === channel_id )
 			return null;
 
 		return channel_id === hosting_id ? 'Unhost' : 'Host';