Fixed notification form

[ based on: b452fb393a2e14c2e47cdcc0bcb8b81f9c0faa03 ]