Fixes for event registration.

#2353
![selection_007](https://f.cloud.github.com/assets/1222368/659388/0562a4e4-d690-11e2-9909-8dc75629d03b.png)
![selection_009](https://f.cloud.github.com/assets/1222368/659393/84e7fb10-d690-11e2-9de4-1a17f11529f9.png)
![selection_008](https://f.cloud.github.com/assets/1222368/659394/87048ed6-d690-11e2-8070-3829dde0d6eb.png)