Finished bug fixing
Fix enabled notification by default