diff --git a/app/view/add/Add.js b/app/view/add/Add.js
index cbe8ba54..b9ad773d 100644
--- a/app/view/add/Add.js
+++ b/app/view/add/Add.js
@@ -195,19 +195,19 @@ Ext.define('Rambox.view.add.Add',{
 									    xtype: 'checkbox'
 									   ,boxLabel: "Use passive listeners"
 									   ,name: 'passive_event_listeners'
-									   ,checked: me.edit ? me.record.get('passive_event_listeners') : true
+									   ,checked: me.edit ? me.service.get('passive_event_listeners') : me.record.get('passive_event_listeners')
 									   ,uncheckedValue: false
 									   ,inputValue: true
-									   ,hidden: Ext.getStore('ServicesList').getById(me.record.get('type')).get('passive_event_listeners') === false
+									   ,disabled: me.edit ? !me.service.get('passive_event_listeners') : !me.record.get('passive_event_listeners')
 									}
 									,{
 									    xtype: 'checkbox'
 									   ,boxLabel: "100ms timer granularity"
 									   ,name: 'slowed_timers'
-									   ,checked: me.edit ? me.record.get('slowed_timers') : true
+									   ,checked: me.edit ? me.service.get('slowed_timers') : me.record.get('slowed_timers')
 									   ,uncheckedValue: false
 									   ,inputValue: true
-									   ,hidden: Ext.getStore('ServicesList').getById(me.record.get('type')).get('slowed_timers') === false
+									   ,disabled: me.edit ? !me.service.get('slowed_timers') : !me.record.get('slowed_timers')
 									}
 									,{
 										 xtype: 'checkbox'