Events and username reset
manisha-dias-tania branches merged