diff --git a/app/store/Services.js b/app/store/Services.js
index 62eeae81..6ab34ffe 100644
--- a/app/store/Services.js
+++ b/app/store/Services.js
@@ -26,6 +26,19 @@ Ext.define('Rambox.store.Services', {
 			var servicesLeft = [];
 			var servicesRight = [];
 			store.each(function(service) {
+				// Fix some services with bad IDs
+				// TODO: Remove in next release
+				switch ( service.get('type') ) {
+					case 'office365':
+						service.set('type', 'outlook365');
+						break;
+					case ' irccloud':
+						service.set('type', 'irccloud');
+						break;
+					default:
+						break;
+				}
+
 				var cfg = {
 					 xtype: 'webview'
 					,id: 'tab_'+service.get('id')
@@ -33,10 +46,10 @@ Ext.define('Rambox.store.Services', {
 					,icon: service.get('type') !== 'custom' ? 'resources/icons/'+service.get('logo') : ( service.get('logo') === '' ? 'resources/icons/custom.png' : service.get('logo'))
 					,src: service.get('url')
 					,type: service.get('type')
-					,muted: service.get('muted'),
-					includeInGlobalUnreadCounter: service.get('includeInGlobalUnreadCounter'),
-					displayTabUnreadCounter: service.get('displayTabUnreadCounter'),
-					enabled: service.get('enabled')
+					,muted: service.get('muted')
+					,includeInGlobalUnreadCounter: service.get('includeInGlobalUnreadCounter')
+					,displayTabUnreadCounter: service.get('displayTabUnreadCounter')
+					,enabled: service.get('enabled')
 					,record: service
 					,tabConfig: {
 						service: service
diff --git a/app/ux/WebView.js b/app/ux/WebView.js
index 6583a01b..eb8d0655 100644
--- a/app/ux/WebView.js
+++ b/app/ux/WebView.js
@@ -241,7 +241,7 @@ Ext.define('Rambox.ux.WebView',{
 
 			// Injected code to detect new messages
 			if ( me.record ) {
-				var js_unread = Ext.getStore('ServicesList').getById(me.record.get('type') === 'office365' ? 'outlook365' : me.record.get('type')).get('js_unread');
+				var js_unread = Ext.getStore('ServicesList').getById(me.record.get('type')).get('js_unread');
 				js_unread = js_unread + me.record.get('js_unread');
 				if ( js_unread !== '' ) {
 					console.groupCollapsed(me.record.get('type').toUpperCase() + ' - JS Injected to Detect New Messages');